summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-05-13 12:12:50 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-05-13 12:12:50 -0400
commit305808da1049c603519329e66b34068686bfb99e (patch)
tree4c4f0ccd82c34c261644840632640ed5c4359f1f
parent22a2616359ee1f167c85ec21bf416350706a7b5b (diff)
parent968ba15b98263060ed2c3030f27039ba950e7425 (diff)
downloadopenshift-305808da1049c603519329e66b34068686bfb99e.tar.gz
openshift-305808da1049c603519329e66b34068686bfb99e.tar.bz2
openshift-305808da1049c603519329e66b34068686bfb99e.tar.xz
openshift-305808da1049c603519329e66b34068686bfb99e.zip
Merge pull request #223 from kwoodson/multi_ec2_ini
Added option to use alternate ec2.ini.
-rw-r--r--roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j27
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 b/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2
index f7005ff5b..6e794c194 100644
--- a/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2
+++ b/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2
@@ -5,6 +5,13 @@ accounts:
{% for account in oo_inventory_accounts %}
- name: {{ account.name }}
provider: {{ account.provider }}
+ provider_config:
+{% for section, items in account.provider_config.items() %}
+ {{ section }}:
+{% for property, value in items.items() %}
+ {{ property }}: {{ value }}
+{% endfor %}
+{% endfor %}
env_vars:
AWS_ACCESS_KEY_ID: {{ account.env_vars.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: {{ account.env_vars.AWS_SECRET_ACCESS_KEY }}