summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted_facts
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-07-08 10:11:04 -0400
committerGitHub <noreply@github.com>2016-07-08 10:11:04 -0400
commit69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4 (patch)
tree0419cfc12d414a95c987f7667f6618fba923c522 /roles/openshift_hosted_facts
parent8a0c9b6b6a9820b38694cb23979ffc7a8c358588 (diff)
parent57dfae185d3d0e02ebe515263c54867bee37b45e (diff)
downloadopenshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.gz
openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.bz2
openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.tar.xz
openshift-69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4.zip
Merge pull request #2023 from abutcher/openshift-hosted
Various hosted component improvements
Diffstat (limited to 'roles/openshift_hosted_facts')
-rw-r--r--roles/openshift_hosted_facts/tasks/main.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml
index 2a11e6cbd..631bf3e2a 100644
--- a/roles/openshift_hosted_facts/tasks/main.yml
+++ b/roles/openshift_hosted_facts/tasks/main.yml
@@ -1,7 +1,16 @@
---
+- set_fact:
+ openshift_hosted_router_selector: "{{ 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 }}"
+ when: openshift_hosted_registry_selector is not defined and openshift_hosted_infra_selector is defined
+
- name: Set hosted facts
openshift_facts:
role: hosted
openshift_env: "{{ hostvars
| oo_merge_hostvars(vars, inventory_hostname)
| oo_openshift_env }}"
+ openshift_env_structures:
+ - 'openshift.hosted.router.*'