diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-04-28 14:50:04 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-05-03 16:24:41 -0400 |
| commit | 60c4e41791c9517ad7201c8c04f0fee2bff8873c (patch) | |
| tree | a69d7445d088bb068a0192848a8f670b3528b6de | |
| parent | 2f87e0c3f19d313cf16bf91d88a00c7a2938a3d8 (diff) | |
| download | openshift-60c4e41791c9517ad7201c8c04f0fee2bff8873c.tar.gz openshift-60c4e41791c9517ad7201c8c04f0fee2bff8873c.tar.bz2 openshift-60c4e41791c9517ad7201c8c04f0fee2bff8873c.tar.xz openshift-60c4e41791c9517ad7201c8c04f0fee2bff8873c.zip | |
Replace hostvars with vars for openshift env facts when ansible >= v2.
| -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, 9 insertions, 3 deletions
diff --git a/roles/openshift_builddefaults/tasks/main.yml b/roles/openshift_builddefaults/tasks/main.yml index c82aebe72..b5e93f8a2 100644 --- a/roles/openshift_builddefaults/tasks/main.yml +++ b/roles/openshift_builddefaults/tasks/main.yml @@ -5,7 +5,9 @@ # 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) + # | oo_merge_dicts(vars if (ansible_version.full + # | version_compare('2.0', 'ge') + # | bool) else hostvars) # | 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..4924f051c 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -3,7 +3,9 @@ openshift_facts: role: cloudprovider openshift_env: "{{ hostvars[inventory_hostname] - | oo_merge_dicts(hostvars) + | oo_merge_dicts(vars if (ansible_version.full + | version_compare('2.0', 'ge') + | bool) else hostvars) | 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..897fc0b35 100644 --- a/roles/openshift_hosted_facts/tasks/main.yml +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -3,5 +3,7 @@ openshift_facts: role: hosted openshift_env: "{{ hostvars[inventory_hostname] - | oo_merge_dicts(hostvars) + | oo_merge_dicts(vars if (ansible_version.full + | version_compare('2.0', 'ge') + | bool) else hostvars) | oo_openshift_env }}" |