summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-12-04 17:17:51 +0100
committerTomas Sedovic <tomas@sedovic.cz>2017-12-04 17:18:23 +0100
commit01fc87d824ea5bc96f29abee3aa27bb027f8bf5f (patch)
tree8f277a30c534e5effaaba7d587f42c1aed0e9460
parentcbee76e15e860ccf3f40231e22c226f70a236faa (diff)
downloadopenshift-01fc87d824ea5bc96f29abee3aa27bb027f8bf5f.tar.gz
openshift-01fc87d824ea5bc96f29abee3aa27bb027f8bf5f.tar.bz2
openshift-01fc87d824ea5bc96f29abee3aa27bb027f8bf5f.tar.xz
openshift-01fc87d824ea5bc96f29abee3aa27bb027f8bf5f.zip
Use openshift_release instead of ose_version
-rw-r--r--roles/rhel_subscribe/README.md2
-rw-r--r--roles/rhel_subscribe/defaults/main.yml1
-rw-r--r--roles/rhel_subscribe/tasks/enterprise.yml2
3 files changed, 2 insertions, 3 deletions
diff --git a/roles/rhel_subscribe/README.md b/roles/rhel_subscribe/README.md
index 8b3e1fe60..15eaf4f30 100644
--- a/roles/rhel_subscribe/README.md
+++ b/roles/rhel_subscribe/README.md
@@ -22,7 +22,7 @@ Name of the pool to attach (optional).
Custom hostname for the Satellite server (optional).
-### `ose_version`
+### `openshift_release`
Version for the OpenShift Enterprise repositories.
diff --git a/roles/rhel_subscribe/defaults/main.yml b/roles/rhel_subscribe/defaults/main.yml
index f1355510a..80b2ab919 100644
--- a/roles/rhel_subscribe/defaults/main.yml
+++ b/roles/rhel_subscribe/defaults/main.yml
@@ -1,3 +1,2 @@
---
rhsub_pool: 'Red Hat OpenShift Container Platform, Premium*'
-ose_version: '3.6'
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml
index 71f612b6e..48b04b209 100644
--- a/roles/rhel_subscribe/tasks/enterprise.yml
+++ b/roles/rhel_subscribe/tasks/enterprise.yml
@@ -6,7 +6,7 @@
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-{{ openshift_release }}-rpms" \
--enable="rhel-7-fast-datapath-rpms"
register: subscribe_repos
until: subscribe_repos | succeeded