summaryrefslogtreecommitdiffstats
path: root/roles/openshift_ansible_inventory/tasks/main.yml
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-02 15:39:56 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-02 15:39:56 -0400
commitcc65f03c894af8c40cf9c25128c9834f6cbdd02b (patch)
treecb7d113579bb1db1f685408b198397a89052b892 /roles/openshift_ansible_inventory/tasks/main.yml
parentef6b36d14a00757754aaf001a8acad8354cf62ff (diff)
parenta4d5e59c413746cb1715b15a9e158be3f3a94a54 (diff)
downloadopenshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.gz
openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.bz2
openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.xz
openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.zip
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to 'roles/openshift_ansible_inventory/tasks/main.yml')
-rw-r--r--roles/openshift_ansible_inventory/tasks/main.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_ansible_inventory/tasks/main.yml b/roles/openshift_ansible_inventory/tasks/main.yml
index 5fe77e38b..9cc15c0a8 100644
--- a/roles/openshift_ansible_inventory/tasks/main.yml
+++ b/roles/openshift_ansible_inventory/tasks/main.yml
@@ -3,8 +3,9 @@
name: openshift-ansible-inventory
state: present
-- template:
- src: multi_ec2.yaml.j2
+- name:
+ copy:
+ content: "{{ oo_inventory_accounts | to_nice_yaml }}"
dest: /etc/ansible/multi_ec2.yaml
group: "{{ oo_inventory_group }}"
owner: "{{ oo_inventory_owner }}"
@@ -39,5 +40,5 @@
owner: root
group: libra_ops
recurse: yes
- mode: '2750'
+ mode: '2770'
when: oo_inventory_cache_location is defined