From 01fc87d824ea5bc96f29abee3aa27bb027f8bf5f Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Mon, 4 Dec 2017 17:17:51 +0100 Subject: Use openshift_release instead of ose_version --- roles/rhel_subscribe/README.md | 2 +- roles/rhel_subscribe/defaults/main.yml | 1 - roles/rhel_subscribe/tasks/enterprise.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'roles/rhel_subscribe') 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 -- cgit v1.2.1