diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-08 17:13:48 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-08 17:13:48 -0400 |
| commit | 64c81e42bbd859977c059c4b2a154d59382a7c27 (patch) | |
| tree | a88635dc132fac16c713f393feecf58cce31f19b /roles/openshift_cloud_provider | |
| parent | d6d9cba774291c821c9531aa05049a6e3e22d7ff (diff) | |
| parent | 8591af8679e13374d9f13d8867679adee45a7d0d (diff) | |
| download | openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.tar.gz openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.tar.bz2 openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.tar.xz openshift-64c81e42bbd859977c059c4b2a154d59382a7c27.zip | |
Merge pull request #1733 from abutcher/hosted-facts
Fix hosted facts
Diffstat (limited to 'roles/openshift_cloud_provider')
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 8 |
1 files changed, 3 insertions, 5 deletions
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: |