diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-09-14 13:17:07 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2017-09-29 10:57:21 -0400 |
| commit | b09f52797efe0dd5f4888672935bbf3b501dea37 (patch) | |
| tree | b432b55e59d97cea7f018f52af123d77ba5a1aa7 /roles/rhel_subscribe/tasks | |
| parent | 9920ea81d7f036432553921b708cf8c49ac6ea62 (diff) | |
| download | openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.tar.gz openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.tar.bz2 openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.tar.xz openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.zip | |
Remove oo_option facts.
Diffstat (limited to 'roles/rhel_subscribe/tasks')
| -rw-r--r-- | roles/rhel_subscribe/tasks/enterprise.yml | 2 | ||||
| -rw-r--r-- | roles/rhel_subscribe/tasks/main.yml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml index 9738929d2..fa74c9953 100644 --- a/roles/rhel_subscribe/tasks/enterprise.yml +++ b/roles/rhel_subscribe/tasks/enterprise.yml @@ -7,7 +7,7 @@ when: deployment_type == 'openshift-enterprise' - set_fact: - ose_version: "{{ lookup('oo_option', 'ose_version') | default(default_ose_version, True) }}" + ose_version: "{{ lookup('env', 'ose_version') | default(default_ose_version, True) }}" - fail: msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type" diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml index c43e5513d..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('oo_option', 'rhel_subscription_pool') | default(rhsub_pool, True) | default('Red Hat OpenShift Container Platform, Premium*', True) }}" - rhel_subscription_user: "{{ lookup('oo_option', 'rhel_subscription_user') | default(rhsub_user, True) | default(omit, True) }}" - rhel_subscription_pass: "{{ lookup('oo_option', 'rhel_subscription_pass') | default(rhsub_pass, True) | default(omit, True) }}" - rhel_subscription_server: "{{ lookup('oo_option', 'rhel_subscription_server') | default(rhsub_server) }}" + 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" |