Merge pull request #2266 from riverzhang/epel-release

Disalbe install epel-release rpm on Centos/Redhat

roles/kubernetes/preinstall/defaults/main.yml

@@ -4,8 +4,7 @@ run_gitinfos: false
 # Set to true to allow pre-checks to fail and continue deployment
 ignore_assert_errors: false
 
-epel_rpm_download_url: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+epel_enabled: false
-epel_enabled: true
 
 common_required_pkgs:
   - python-httplib2

roles/kubernetes/preinstall/tasks/main.yml

@@ -172,18 +172,13 @@
     - bootstrap-os
 
 - name: Install epel-release on RedHat/CentOS
-  shell: rpm -qa | grep epel-release || rpm -ivh {{ epel_rpm_download_url }}
+  yum:
-  register: epel_task_result
+    name: epel-release
-  until: epel_task_result|succeeded
+    state: present
-  retries: 4
-  delay: "{{ retry_stagger | random + 3 }}"
-  changed_when: False
   when:
     - ansible_distribution in ["CentOS","RedHat"]
     - not is_atomic
-    - epel_rpm_download_url != ''
     - epel_enabled|bool
-  check_mode: no
   tags:
     - bootstrap-os