From 8591af8679e13374d9f13d8867679adee45a7d0d Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Fri, 8 Apr 2016 16:14:49 -0400
Subject: Merge openshift_env hostvars.
---
roles/openshift_hosted_facts/tasks/main.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(limited to 'roles/openshift_hosted_facts')
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 }}"
--
cgit v1.2.3