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 | |
| 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')
| -rw-r--r-- | roles/openshift_builddefaults/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_hosted_facts/tasks/main.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_builddefaults/tasks/main.yml b/roles/openshift_builddefaults/tasks/main.yml index c82aebe72..6a4e919e8 100644 --- a/roles/openshift_builddefaults/tasks/main.yml +++ b/roles/openshift_builddefaults/tasks/main.yml @@ -4,8 +4,8 @@ role: builddefaults # TODO: add ability to define builddefaults env vars sort of like this # may need to move the config generation to a filter however. - # 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.builddefaults.env.*' 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.*' diff --git a/roles/openshift_hosted_facts/tasks/main.yml b/roles/openshift_hosted_facts/tasks/main.yml index f595e1e81..2a11e6cbd 100644 --- a/roles/openshift_hosted_facts/tasks/main.yml +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -2,6 +2,6 @@ - name: Set hosted facts openshift_facts: role: hosted - openshift_env: "{{ hostvars[inventory_hostname] - | oo_merge_dicts(hostvars) + openshift_env: "{{ hostvars + | oo_merge_hostvars(vars, inventory_hostname) | oo_openshift_env }}" |