summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-03 13:03:19 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-03 13:03:19 -0400
commit4b0f5219f4ec3eeb5433fc9f985b1e067b581276 (patch)
tree8f3d442273d7b2d5313a810cc7d44d31fe4e6ca3 /roles
parentee0a668a8848b6d707a57de1b908584cf0b28d5d (diff)
downloadopenshift-4b0f5219f4ec3eeb5433fc9f985b1e067b581276.tar.gz
openshift-4b0f5219f4ec3eeb5433fc9f985b1e067b581276.tar.bz2
openshift-4b0f5219f4ec3eeb5433fc9f985b1e067b581276.tar.xz
openshift-4b0f5219f4ec3eeb5433fc9f985b1e067b581276.zip
Fix hosted selector variable migration
Currently, if undefined, openshift_hosted_router_selector and openshift_hosted_registry_selector as set to the value of openshift_hosted_infra_selector. The set_fact logic overrides variable migration inside of oo_filters meant to utilize the deprecated variables openshift_router_selector and openshift_registiry_selector, respectively. This commit corrects the set_fact logic and removes the unused migration from oo_filters. Fixes: https://github.com/openshift/openshift-ansible/issues/5615
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_hosted_facts/tasks/main.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml
index 53d1a8bc7..47dc9171d 100644
--- a/roles/openshift_hosted_facts/tasks/main.yml
+++ b/roles/openshift_hosted_facts/tasks/main.yml
@@ -1,9 +1,11 @@
---
+# openshift_*_selector variables have been deprecated in favor of
+# openshift_hosted_*_selector variables.
- set_fact:
- openshift_hosted_router_selector: "{{ openshift_hosted_infra_selector }}"
+ openshift_hosted_router_selector: "{{ openshift_router_selector | default(openshift_hosted_infra_selector) }}"
when: openshift_hosted_router_selector is not defined and openshift_hosted_infra_selector is defined
- set_fact:
- openshift_hosted_registry_selector: "{{ openshift_hosted_infra_selector }}"
+ openshift_hosted_registry_selector: "{{ openshift_registry_selector | default(openshift_hosted_infra_selector) }}"
when: openshift_hosted_registry_selector is not defined and openshift_hosted_infra_selector is defined
- name: Set hosted facts