summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-17 08:43:37 -0400
committerGitHub <noreply@github.com>2017-08-17 08:43:37 -0400
commite5e936e60e9221142b0cd394b4c8e5f45cb9dd6e (patch)
tree57abdf7dbfcfd26b0bcb6bcf542ed3cc4f632e6c /roles
parent1f38d72448d1823c0664fb27a67af43365cb95a0 (diff)
parent9d5c8a10dd5532c0364287314aa249c8bd7d346e (diff)
downloadopenshift-e5e936e60e9221142b0cd394b4c8e5f45cb9dd6e.tar.gz
openshift-e5e936e60e9221142b0cd394b4c8e5f45cb9dd6e.tar.bz2
openshift-e5e936e60e9221142b0cd394b4c8e5f45cb9dd6e.tar.xz
openshift-e5e936e60e9221142b0cd394b4c8e5f45cb9dd6e.zip
Merge pull request #5113 from bacek/master
Enable version 3.6 for OSE
Diffstat (limited to 'roles')
-rw-r--r--roles/rhel_subscribe/tasks/enterprise.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml
index ea0c42150..39d59db70 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.5'
+ default_ose_version: '3.6'
when: deployment_type in ['atomic-enterprise', 'openshift-enterprise']
- set_fact:
@@ -16,7 +16,7 @@
- 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', '3.5'] )
+ ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] )
- name: Enable RHEL repositories
command: subscription-manager repos \