diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-28 21:03:25 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-12-05 09:40:51 -0500 |
commit | 0de559c8f2fd310fe36047ae000574229b7858c9 (patch) | |
tree | dcc495513f182308f7266a94a951b99d58f761d2 /roles/openshift_hosted_facts | |
parent | 351785e4c44101fb109f03ac4aedbddd86faaa72 (diff) | |
download | openshift-0de559c8f2fd310fe36047ae000574229b7858c9.tar.gz openshift-0de559c8f2fd310fe36047ae000574229b7858c9.tar.bz2 openshift-0de559c8f2fd310fe36047ae000574229b7858c9.tar.xz openshift-0de559c8f2fd310fe36047ae000574229b7858c9.zip |
Fix hosted vars
Remove hosted vars from openshift_facts.
The current pattern is causing a bunch of undesired sideffects.
Diffstat (limited to 'roles/openshift_hosted_facts')
-rw-r--r-- | roles/openshift_hosted_facts/tasks/main.yml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml index 8fc70cecb..ed97d539c 100644 --- a/roles/openshift_hosted_facts/tasks/main.yml +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -1,19 +1 @@ --- -# openshift_*_selector variables have been deprecated in favor of -# openshift_hosted_*_selector variables. -- set_fact: - 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_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 - openshift_facts: - role: "{{ item }}" - openshift_env: "{{ hostvars - | oo_merge_hostvars(vars, inventory_hostname) - | oo_openshift_env }}" - openshift_env_structures: - - 'openshift.hosted.router.*' - with_items: [hosted, logging, loggingops, metrics, prometheus] |