summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-10-28 17:15:49 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-10-28 17:15:49 -0400
commit54319616cfc0ee15ded018a788cfcbb9426ddacc (patch)
tree2256e2793b084676cf89f20fa4d124dc8742fc98 /roles
parent9bc5a8982044fdc614dbc5c8e69d52ecea542eaf (diff)
parentdd40ef91df598cf79e67543ec826871cbedbca9d (diff)
downloadopenshift-54319616cfc0ee15ded018a788cfcbb9426ddacc.tar.gz
openshift-54319616cfc0ee15ded018a788cfcbb9426ddacc.tar.bz2
openshift-54319616cfc0ee15ded018a788cfcbb9426ddacc.tar.xz
openshift-54319616cfc0ee15ded018a788cfcbb9426ddacc.zip
Merge pull request #759 from kwoodson/minventory
Fixed rename for extra_vars.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 b/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2
index 8228ab915..ce8515e17 100644
--- a/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2
+++ b/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2
@@ -15,10 +15,10 @@ accounts:
env_vars:
AWS_ACCESS_KEY_ID: {{ account.env_vars.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: {{ account.env_vars.AWS_SECRET_ACCESS_KEY }}
-{% if account.all_group is defined and account.hostvars is defined%}
+{% if account.all_group is defined and account.extra_vars is defined%}
all_group: {{ account.all_group }}
- hostvars:
-{% for property, value in account.hostvars.items() %}
+ extra_vars:
+{% for property, value in account.extra_vars.items() %}
{{ property }}: {{ value }}
{% endfor %}
{% endif %}