diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-05 15:30:44 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-05 15:30:44 -0400 |
| commit | b55268ba29f436a2ade9643adf195d23145d0826 (patch) | |
| tree | 433643d098d2d38ee3629e5371674911b38878d1 /roles/openshift_cloud_provider | |
| parent | 2534b73692e16f54ffdd623e305c3cd1f494eff3 (diff) | |
| parent | f0c412a9ab50a9030d51f83c459a66451a7c344a (diff) | |
| download | openshift-b55268ba29f436a2ade9643adf195d23145d0826.tar.gz openshift-b55268ba29f436a2ade9643adf195d23145d0826.tar.bz2 openshift-b55268ba29f436a2ade9643adf195d23145d0826.tar.xz openshift-b55268ba29f436a2ade9643adf195d23145d0826.zip | |
Merge pull request #1853 from abutcher/v2-hostvars
Replace hostvars with vars for openshift env facts when ansible >= v2.
Diffstat (limited to 'roles/openshift_cloud_provider')
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml index d7442924f..6111d1207 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -2,8 +2,8 @@ - name: Set cloud provider facts openshift_facts: role: cloudprovider - openshift_env: "{{ hostvars[inventory_hostname] - | oo_merge_dicts(hostvars) + openshift_env: "{{ hostvars + | oo_merge_hostvars(vars, inventory_hostname) | oo_openshift_env }}" openshift_env_structures: - 'openshift.cloudprovider.aws.*' |