summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-26 00:06:50 -0500
committerGitHub <noreply@github.com>2017-04-26 00:06:50 -0500
commit760bdbc78081d9780d2618c422f31913dd9d38c7 (patch)
treeda0327f8673db877da84319bb670c9114da9c412
parent9fa4e1c17ddf5e6554ded7ecdc3432e526df561e (diff)
parent53d9cf3e907c2eac67fa830ab99bb1fd825c240d (diff)
downloadopenshift-760bdbc78081d9780d2618c422f31913dd9d38c7.tar.gz
openshift-760bdbc78081d9780d2618c422f31913dd9d38c7.tar.bz2
openshift-760bdbc78081d9780d2618c422f31913dd9d38c7.tar.xz
openshift-760bdbc78081d9780d2618c422f31913dd9d38c7.zip
Merge pull request #3950 from lhuard1A/enterprise_ose_3.5
Merged by openshift-bot
-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