diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-30 14:14:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 14:14:18 -0700 |
| commit | 62cb2a8d573928cb54a7d0ba475d61a6b65e0307 (patch) | |
| tree | 74dc3c17224fe6d2b3bd4dfffc521e348c74eeb8 /roles/rhel_subscribe/tasks | |
| parent | 99c3117df11f1d6b5240dc72f57b2f7f541a234a (diff) | |
| parent | b649749bac0a086199820f91f85fe42ba99f206e (diff) | |
| download | openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.gz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.bz2 openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.xz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.zip | |
Merge pull request #5449 from abutcher/wildcard-router-cert-redeploy
Automatic merge from submit-queue.
Bug 1490186: Router pod not running after router certificates redeployment
This carries https://github.com/openshift/openshift-ansible/pull/5417. More of the router cert redeploy logic could be moved into the `openshift_hosted` role with a flag. I may pull those over.
https://bugzilla.redhat.com/show_bug.cgi?id=1490186
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" |