Browse Source

Don't require fast-datapath channel on RHEL

Vadim Rutkovsky 6 years ago
parent
commit
cbd85a8598

+ 0 - 7
playbooks/azure/openshift-cluster/group_vars/all/yum_repos.yml

@@ -33,13 +33,6 @@ azure_node_repos:
     sslclientkey: /var/lib/yum/client-key.pem
     enabled: yes
 
-  - name: rhel-7-fast-datapath-rpms
-    baseurl: https://mirror.openshift.com/enterprise/rhel/rhel-7-fast-datapath-rpms/
-    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-    sslclientcert: /var/lib/yum/client-cert.pem
-    sslclientkey: /var/lib/yum/client-key.pem
-    enabled: yes
-
   - name: rhel-7-server-ansible-2.4-rpms
     baseurl: https://mirror.openshift.com/enterprise/rhel/rhel-7-server-ansible-2.4-rpms/
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release

+ 1 - 2
roles/openshift_repos/tasks/rhel_repos.yml

@@ -26,8 +26,7 @@
   command: subscription-manager repos \
                --enable="rhel-7-server-rpms" \
                --enable="rhel-7-server-extras-rpms" \
-               --enable="rhel-7-server-ose-{{ ( openshift_version ).split('.')[0:2] | join('.') }}-rpms" \
-               --enable="rhel-7-fast-datapath-rpms"
+               --enable="rhel-7-server-ose-{{ ( openshift_version ).split('.')[0:2] | join('.') }}-rpms"
   register: subscribe_repos
   until: subscribe_repos is succeeded
   when: repo_rhel.changed