summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2015-04-29 12:40:42 -0400
committerMatt Woodson <mwoodson@gmail.com>2015-04-29 12:40:42 -0400
commite177997ba3c1338e69c13246eaff72be40a0761f (patch)
tree1f264f319075a0766f545d7ffcd7a5d1bc656204 /roles
parent9000963a106810ba6993940b3b84484e4b15e75b (diff)
parentae10ca0213897cc41b5dd7a497006bb3bb4a9699 (diff)
downloadopenshift-e177997ba3c1338e69c13246eaff72be40a0761f.tar.gz
openshift-e177997ba3c1338e69c13246eaff72be40a0761f.tar.bz2
openshift-e177997ba3c1338e69c13246eaff72be40a0761f.tar.xz
openshift-e177997ba3c1338e69c13246eaff72be40a0761f.zip
Merge pull request #193 from mwoodson/ec2_vars
added destination_vars to ec2.ini
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_ansible_inventory/tasks/main.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/roles/openshift_ansible_inventory/tasks/main.yml b/roles/openshift_ansible_inventory/tasks/main.yml
index d68d27f84..dddfe24e3 100644
--- a/roles/openshift_ansible_inventory/tasks/main.yml
+++ b/roles/openshift_ansible_inventory/tasks/main.yml
@@ -29,3 +29,17 @@
backrefs: yes
regexp: '^(hostfile|inventory)( *)='
line: '\1\2= /etc/ansible/inventory'
+
+- name: setting ec2.ini destination_format
+ lineinfile:
+ dest: /usr/share/ansible/inventory/aws/ec2.ini
+ regexp: '^destination_format *='
+ line: "destination_format = {{ oo_ec2_destination_format }}"
+ when: oo_ec2_destination_format is defined
+
+- name: setting ec2.ini destination_format_tags
+ lineinfile:
+ dest: /usr/share/ansible/inventory/aws/ec2.ini
+ regexp: '^destination_format_tags *='
+ line: "destination_format_tags = {{ oo_ec2_destination_format_tags }}"
+ when: oo_ec2_destination_format_tags is defined