From 9562adf37d853dd03531fde7b14e249736e10d88 Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Fri, 1 Dec 2017 12:14:20 +0100 Subject: Remove reading shell environment in rhel_subscribe The rhel_subscribe role used to read the shell environment variables for its input with a broken fallback to Ansible variables. This updates the role to only use Ansible vars. If the user wants to do an env lookup, they can do so when calling the role. --- roles/rhel_subscribe/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 roles/rhel_subscribe/defaults/main.yml (limited to 'roles/rhel_subscribe/defaults/main.yml') diff --git a/roles/rhel_subscribe/defaults/main.yml b/roles/rhel_subscribe/defaults/main.yml new file mode 100644 index 000000000..6035a5f00 --- /dev/null +++ b/roles/rhel_subscribe/defaults/main.yml @@ -0,0 +1,2 @@ +rhsub_pool: 'Red Hat OpenShift Container Platform, Premium*' +ose_version: '3.6' -- cgit v1.2.3 From f3e9b50a37ee414faefa734582a58a046796be32 Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Fri, 1 Dec 2017 13:24:06 +0100 Subject: Fix tox --- roles/rhel_subscribe/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/rhel_subscribe/defaults/main.yml') diff --git a/roles/rhel_subscribe/defaults/main.yml b/roles/rhel_subscribe/defaults/main.yml index 6035a5f00..f1355510a 100644 --- a/roles/rhel_subscribe/defaults/main.yml +++ b/roles/rhel_subscribe/defaults/main.yml @@ -1,2 +1,3 @@ +--- rhsub_pool: 'Red Hat OpenShift Container Platform, Premium*' ose_version: '3.6' -- cgit v1.2.3 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/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/rhel_subscribe/defaults/main.yml') 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' -- cgit v1.2.3