summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted_facts
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-04-08 16:14:49 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-04-08 16:14:49 -0400
commit8591af8679e13374d9f13d8867679adee45a7d0d (patch)
tree34c8f83832193f407a26a5e194977a623a1a6d26 /roles/openshift_hosted_facts
parentba4debd2aa9c808cd982030d3589443e87bb900e (diff)
downloadopenshift-8591af8679e13374d9f13d8867679adee45a7d0d.tar.gz
openshift-8591af8679e13374d9f13d8867679adee45a7d0d.tar.bz2
openshift-8591af8679e13374d9f13d8867679adee45a7d0d.tar.xz
openshift-8591af8679e13374d9f13d8867679adee45a7d0d.zip
Merge openshift_env hostvars.
Diffstat (limited to 'roles/openshift_hosted_facts')
-rw-r--r--roles/openshift_hosted_facts/tasks/main.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml
index 13e06e632..f595e1e81 100644
--- a/roles/openshift_hosted_facts/tasks/main.yml
+++ b/roles/openshift_hosted_facts/tasks/main.yml
@@ -2,8 +2,6 @@
- name: Set hosted facts
openshift_facts:
role: hosted
- openshift_env: "{{ item | oo_openshift_env }}"
- no_log: true
- with_items:
- - "{{ hostvars[inventory_hostname] }}"
- - "{{ hostvars }}"
+ openshift_env: "{{ hostvars[inventory_hostname]
+ | oo_merge_dicts(hostvars)
+ | oo_openshift_env }}"