diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-05-11 10:19:46 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-05-11 10:19:46 -0400 |
| commit | 60a12e50838b56f5a24278762b56d606c2f24572 (patch) | |
| tree | 35c1218f2be27d2428bacd9dc89bdb8a052f9476 /roles | |
| parent | a904e38c5fd4740c04ef700a221322b84f27aa64 (diff) | |
| parent | d9b276629476dc2d6de3ef32717bf2035f4338c2 (diff) | |
| download | openshift-60a12e50838b56f5a24278762b56d606c2f24572.tar.gz openshift-60a12e50838b56f5a24278762b56d606c2f24572.tar.bz2 openshift-60a12e50838b56f5a24278762b56d606c2f24572.tar.xz openshift-60a12e50838b56f5a24278762b56d606c2f24572.zip | |
Merge pull request #220 from kwoodson/global_config
Adding cache location for multi ec2.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_ansible_inventory/tasks/main.yml | 19 | ||||
| -rw-r--r-- | roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/roles/openshift_ansible_inventory/tasks/main.yml b/roles/openshift_ansible_inventory/tasks/main.yml index dddfe24e3..91c96d827 100644 --- a/roles/openshift_ansible_inventory/tasks/main.yml +++ b/roles/openshift_ansible_inventory/tasks/main.yml @@ -24,6 +24,14 @@ 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' + minute: '*/10' + job: '/usr/share/ansible/inventory/multi_ec2.py --refresh-cache &> /dev/null' + when: oo_cron_refresh_cache is defined and oo_cron_refresh_cache + - lineinfile: dest: /etc/ansible/ansible.cfg backrefs: yes @@ -43,3 +51,14 @@ regexp: '^destination_format_tags *=' line: "destination_format_tags = {{ oo_ec2_destination_format_tags }}" when: oo_ec2_destination_format_tags is defined + +- name: Set cache location + file: + state: directory + dest: "{{ oo_inventory_cache_location | dirname }}" + owner: root + group: libra_ops + recurse: yes + mode: '2750' + when: oo_inventory_cache_location is defined + diff --git a/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 b/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 index 23dfe73b8..f7005ff5b 100644 --- a/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 +++ b/roles/openshift_ansible_inventory/templates/multi_ec2.yaml.j2 @@ -1,5 +1,6 @@ # multi ec2 inventory configs cache_max_age: {{ oo_inventory_cache_max_age }} +cache_location: {{ oo_inventory_cache_location | default('~/.ansible/tmp/multi_ec2_inventory.cache') }} accounts: {% for account in oo_inventory_accounts %} - name: {{ account.name }} |