diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-05-03 16:56:15 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-05-04 11:21:07 -0400 |
| commit | f0c412a9ab50a9030d51f83c459a66451a7c344a (patch) | |
| tree | cb0363a5c89cbb55cd22e3173da7cbe5ef45a773 /roles | |
| parent | 60c4e41791c9517ad7201c8c04f0fee2bff8873c (diff) | |
| download | openshift-f0c412a9ab50a9030d51f83c459a66451a7c344a.tar.gz openshift-f0c412a9ab50a9030d51f83c459a66451a7c344a.tar.bz2 openshift-f0c412a9ab50a9030d51f83c459a66451a7c344a.tar.xz openshift-f0c412a9ab50a9030d51f83c459a66451a7c344a.zip | |
Add oo_merge_hostvars filter for merging host & play variables.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_builddefaults/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_hosted_facts/tasks/main.yml | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/roles/openshift_builddefaults/tasks/main.yml b/roles/openshift_builddefaults/tasks/main.yml index b5e93f8a2..6a4e919e8 100644 --- a/roles/openshift_builddefaults/tasks/main.yml +++ b/roles/openshift_builddefaults/tasks/main.yml @@ -4,10 +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(vars if (ansible_version.full - # | version_compare('2.0', 'ge') - # | bool) else 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 4924f051c..6111d1207 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -2,10 +2,8 @@ - name: Set cloud provider facts openshift_facts: role: cloudprovider - openshift_env: "{{ hostvars[inventory_hostname] - | oo_merge_dicts(vars if (ansible_version.full - | version_compare('2.0', 'ge') - | bool) else 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 897fc0b35..2a11e6cbd 100644 --- a/roles/openshift_hosted_facts/tasks/main.yml +++ b/roles/openshift_hosted_facts/tasks/main.yml @@ -2,8 +2,6 @@ - name: Set hosted facts openshift_facts: role: hosted - openshift_env: "{{ hostvars[inventory_hostname] - | oo_merge_dicts(vars if (ansible_version.full - | version_compare('2.0', 'ge') - | bool) else hostvars) + openshift_env: "{{ hostvars + | oo_merge_hostvars(vars, inventory_hostname) | oo_openshift_env }}" |