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_cloud_provider/tasks/main.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'roles/openshift_cloud_provider')

diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml
index 471fd686b..d7442924f 100644
--- a/roles/openshift_cloud_provider/tasks/main.yml
+++ b/roles/openshift_cloud_provider/tasks/main.yml
@@ -2,14 +2,12 @@
 - name: Set cloud provider facts
   openshift_facts:
     role: cloudprovider
-    openshift_env: "{{ item | oo_openshift_env }}"
+    openshift_env: "{{ hostvars[inventory_hostname]
+                       | oo_merge_dicts(hostvars)
+                       | oo_openshift_env }}"
     openshift_env_structures:
     - 'openshift.cloudprovider.aws.*'
     - 'openshift.cloudprovider.openstack.*'
-  no_log: true
-  with_items:
-  - "{{ hostvars[inventory_hostname] }}"
-  - "{{ hostvars }}"
 
 - name: Create cloudprovider config dir
   file:
-- 
cgit v1.2.1