Explorar o código

Merge pull request #3950 from lhuard1A/enterprise_ose_3.5

Merged by openshift-bot
OpenShift Bot %!s(int64=8) %!d(string=hai) anos
pai
achega
760bdbc780
Modificáronse 1 ficheiros con 6 adicións e 3 borrados
  1. 6 3
      roles/rhel_subscribe/tasks/enterprise.yml

+ 6 - 3
roles/rhel_subscribe/tasks/enterprise.yml

@@ -7,7 +7,7 @@
   when: deployment_type == 'enterprise'
   when: deployment_type == 'enterprise'
 
 
 - set_fact:
 - set_fact:
-    default_ose_version: '3.4'
+    default_ose_version: '3.5'
   when: deployment_type in ['atomic-enterprise', 'openshift-enterprise']
   when: deployment_type in ['atomic-enterprise', 'openshift-enterprise']
 
 
 - set_fact:
 - set_fact:
@@ -16,10 +16,13 @@
 - fail:
 - fail:
     msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type"
     msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type"
   when: ( deployment_type == 'enterprise' and ose_version not in ['3.0'] ) or
   when: ( deployment_type == 'enterprise' and ose_version not in ['3.0'] ) or
-        ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3', '3.4'] )
+        ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5'] )
 
 
 - name: Enable RHEL repositories
 - name: Enable RHEL repositories
   command: subscription-manager repos \
   command: subscription-manager repos \
                --enable="rhel-7-server-rpms" \
                --enable="rhel-7-server-rpms" \
                --enable="rhel-7-server-extras-rpms" \
                --enable="rhel-7-server-extras-rpms" \
-               --enable="rhel-7-server-ose-{{ ose_version }}-rpms"
+               --enable="rhel-7-server-ose-{{ ose_version }}-rpms" \
+               --enable="rhel-7-fast-datapath-rpms"
+  register: subscribe_repos
+  until: subscribe_repos | succeeded