diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-12-01 12:20:43 +0100 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-12-01 12:20:43 +0100 |
| commit | 576e06f6d531eccafe1b3586e2c521c52706c1ec (patch) | |
| tree | 0bb14b05c74026083cb2a66b272f93a1fe15fc00 | |
| parent | 1c0c502988b0f1d014e5cba7f789d344c56f2d1b (diff) | |
| download | openshift-576e06f6d531eccafe1b3586e2c521c52706c1ec.tar.gz openshift-576e06f6d531eccafe1b3586e2c521c52706c1ec.tar.bz2 openshift-576e06f6d531eccafe1b3586e2c521c52706c1ec.tar.xz openshift-576e06f6d531eccafe1b3586e2c521c52706c1ec.zip | |
Revert "Fix the env lookup fallback in rhel_subscribe"
The rhel_subscribe role fixes will be done in a separate pull request.
This reverts commit 691179281336dcd56d17b70cdf4067a142238b83.
| -rw-r--r-- | roles/rhel_subscribe/tasks/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml index 5867f0207..b06f51908 100644 --- a/roles/rhel_subscribe/tasks/main.yml +++ b/roles/rhel_subscribe/tasks/main.yml @@ -4,10 +4,10 @@ # to make it able to enable repositories - set_fact: - rhel_subscription_pool: "{{ lookup('env', 'rhel_subscription_pool') | default(rhsub_pool | default('Red Hat OpenShift Container Platform, Premium*'), True) }}" - rhel_subscription_user: "{{ lookup('env', 'rhel_subscription_user') | default(rhsub_user | default(omit, True), True) }}" - rhel_subscription_pass: "{{ lookup('env', 'rhel_subscription_pass') | default(rhsub_pass | default(omit, True), True) }}" - rhel_subscription_server: "{{ lookup('env', 'rhel_subscription_server') | default(rhsub_server | default(omit, True), True) }}" + rhel_subscription_pool: "{{ lookup('env', 'rhel_subscription_pool') | default(rhsub_pool | default('Red Hat OpenShift Container Platform, Premium*')) }}" + rhel_subscription_user: "{{ lookup('env', 'rhel_subscription_user') | default(rhsub_user | default(omit, True)) }}" + rhel_subscription_pass: "{{ lookup('env', 'rhel_subscription_pass') | default(rhsub_pass | default(omit, True)) }}" + rhel_subscription_server: "{{ lookup('env', 'rhel_subscription_server') | default(rhsub_server | default(omit, True)) }}" - fail: msg: "This role is only supported for Red Hat hosts" |