summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-04 10:13:05 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-11-04 10:13:05 -0500
commit9dff4e68bf1e40fac6b8e957f06a06b420a0e887 (patch)
tree306735f0511870e1a45ddc7d5d78ba663bd166d4 /roles
parente275c1d17872f9727af3ac63ebae2d8a1b088649 (diff)
parent4b85e4fae04a71cf2cea17018b9240b369f145d5 (diff)
downloadopenshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.tar.gz
openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.tar.bz2
openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.tar.xz
openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.zip
Merge pull request #793 from kwoodson/multiinventory
Renamed multi_ec2 to multi_inventory. Adding support for gce to mult_inventory.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_ansible_inventory/tasks/main.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_ansible_inventory/tasks/main.yml b/roles/openshift_ansible_inventory/tasks/main.yml
index 9cc15c0a8..bce6a8745 100644
--- a/roles/openshift_ansible_inventory/tasks/main.yml
+++ b/roles/openshift_ansible_inventory/tasks/main.yml
@@ -6,7 +6,7 @@
- name:
copy:
content: "{{ oo_inventory_accounts | to_nice_yaml }}"
- dest: /etc/ansible/multi_ec2.yaml
+ dest: /etc/ansible/multi_inventory.yaml
group: "{{ oo_inventory_group }}"
owner: "{{ oo_inventory_owner }}"
mode: "0640"
@@ -20,17 +20,17 @@
- file:
state: link
- src: /usr/share/ansible/inventory/multi_ec2.py
- dest: /etc/ansible/inventory/multi_ec2.py
+ src: /usr/share/ansible/inventory/multi_inventory.py
+ dest: /etc/ansible/inventory/multi_inventory.py
owner: root
group: libra_ops
# This cron uses the above location to call its job
- name: Cron to keep cache fresh
cron:
- name: 'multi_ec2_inventory'
+ name: 'multi_inventory'
minute: '*/10'
- job: '/usr/share/ansible/inventory/multi_ec2.py --refresh-cache &> /dev/null'
+ job: '/usr/share/ansible/inventory/multi_inventory.py --refresh-cache &> /dev/null'
when: oo_cron_refresh_cache is defined and oo_cron_refresh_cache
- name: Set cache location