summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-25 08:19:24 -0500
committerGitHub <noreply@github.com>2017-01-25 08:19:24 -0500
commit800d0d9872807a3173ae268166d211c40fb34283 (patch)
tree9ede575a106097595e5c99404de2b8688b63c80f
parent1fc50fe66e982af1cad58db2f6bddf05cbbef985 (diff)
parent0a27d0adbc8be82e49ccc6e054ae7f70754c1a99 (diff)
downloadopenshift-800d0d9872807a3173ae268166d211c40fb34283.tar.gz
openshift-800d0d9872807a3173ae268166d211c40fb34283.tar.bz2
openshift-800d0d9872807a3173ae268166d211c40fb34283.tar.xz
openshift-800d0d9872807a3173ae268166d211c40fb34283.zip
Merge pull request #3173 from lhuard1A/ose_3.4
Allow RHEL subscription for OSE 3.4
-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 291df6822..41673ee40 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.3'
+ default_ose_version: '3.4'
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'] )
+ ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3', '3.4'] )
- name: Enable RHEL repositories
command: subscription-manager repos \