summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2017-04-19 07:33:10 +0200
committerLénaïc Huard <lhuard@amadeus.com>2017-04-19 07:33:10 +0200
commit53d9cf3e907c2eac67fa830ab99bb1fd825c240d (patch)
tree218a1e0278ae7a50afc0248a71aa2fdd96c89333 /roles
parent233cb72777a5bdea68e5a7703bad53bb012c0bd0 (diff)
downloadopenshift-53d9cf3e907c2eac67fa830ab99bb1fd825c240d.tar.gz
openshift-53d9cf3e907c2eac67fa830ab99bb1fd825c240d.tar.bz2
openshift-53d9cf3e907c2eac67fa830ab99bb1fd825c240d.tar.xz
openshift-53d9cf3e907c2eac67fa830ab99bb1fd825c240d.zip
Make the rhel_subscribe role subscribe to OSE 3.5 channel by default
Diffstat (limited to 'roles')
-rw-r--r--roles/rhel_subscribe/tasks/enterprise.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml
index 41673ee40..ea0c42150 100644
--- a/roles/rhel_subscribe/tasks/enterprise.yml
+++ b/roles/rhel_subscribe/tasks/enterprise.yml
@@ -7,7 +7,7 @@
when: deployment_type == 'enterprise'
- set_fact:
- default_ose_version: '3.4'
+ default_ose_version: '3.5'
when: deployment_type in ['atomic-enterprise', 'openshift-enterprise']
- set_fact:
@@ -16,10 +16,13 @@
- fail:
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
- ( 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
command: subscription-manager repos \
--enable="rhel-7-server-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