diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-29 11:33:10 +0100 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-29 12:50:35 +0100 |
| commit | 691179281336dcd56d17b70cdf4067a142238b83 (patch) | |
| tree | 30d378489d7cb2b93f724debf1d16cf97102011a /roles | |
| parent | e05e4d3d4fab4eaf462a23f5d5ee39fb57f4f0a0 (diff) | |
| download | openshift-691179281336dcd56d17b70cdf4067a142238b83.tar.gz openshift-691179281336dcd56d17b70cdf4067a142238b83.tar.bz2 openshift-691179281336dcd56d17b70cdf4067a142238b83.tar.xz openshift-691179281336dcd56d17b70cdf4067a142238b83.zip | |
Fix the env lookup fallback in rhel_subscribe
The role is looking for the usernames, passwords, etc. first in the
shell environment and then in the Ansible vars.
When the environment is empty, however, the lookup returns an empty
string not an undefined variable, so the `default` fallback is never
used and the ansible variables end up being ignored.
By adding `True` to the end of the filter, it will work with any falsey
value (including an empty string) not just undefined variables.
Diffstat (limited to 'roles')
| -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 b06f51908..5867f0207 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*')) }}" - 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)) }}" + 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) }}" - fail: msg: "This role is only supported for Red Hat hosts" |