diff --git a/ansible/gather/roles/ceilometer/tasks/main.yml b/ansible/gather/roles/ceilometer/tasks/main.yml index fcbd454ba..ce5f8e02c 100644 --- a/ansible/gather/roles/ceilometer/tasks/main.yml +++ b/ansible/gather/roles/ceilometer/tasks/main.yml @@ -13,9 +13,9 @@ when: ceilometer_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: ceilometer_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: ceilometer_config.stat.exists diff --git a/ansible/gather/roles/cinder/tasks/main.yml b/ansible/gather/roles/cinder/tasks/main.yml index 47de30617..9e9f80d54 100644 --- a/ansible/gather/roles/cinder/tasks/main.yml +++ b/ansible/gather/roles/cinder/tasks/main.yml @@ -13,9 +13,9 @@ when: cinder_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: cinder_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: cinder_config.stat.exists diff --git a/ansible/gather/roles/gather/tasks/main.yml b/ansible/gather/roles/gather/tasks/main.yml index 83ca18b08..f04b9aa87 100644 --- a/ansible/gather/roles/gather/tasks/main.yml +++ b/ansible/gather/roles/gather/tasks/main.yml @@ -54,12 +54,12 @@ ignore_errors: true - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: hostvars[inventory_hostname]['containers'] is not defined ignore_errors: true - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: hostvars[inventory_hostname]['containers'] is not defined ignore_errors: true diff --git a/ansible/gather/roles/glance/tasks/main.yml b/ansible/gather/roles/glance/tasks/main.yml index 3330aad7a..b5a2d5c95 100644 --- a/ansible/gather/roles/glance/tasks/main.yml +++ b/ansible/gather/roles/glance/tasks/main.yml @@ -8,7 +8,7 @@ shell: "python /tmp/openstack-config-parser.py glance /tmp/out.yml" - name: Fetch output - fetch: "src=/tmp/out.yml dest=/tmp/out.yml flat=yes" + fetch: "src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes" - name: Load configuration variables - include_vars: "/tmp/out.yml" + include_vars: /tmp/out-{{ inventory_hostname }}.yml diff --git a/ansible/gather/roles/gnocchi/tasks/main.yml b/ansible/gather/roles/gnocchi/tasks/main.yml index 29894a75a..056484b33 100644 --- a/ansible/gather/roles/gnocchi/tasks/main.yml +++ b/ansible/gather/roles/gnocchi/tasks/main.yml @@ -14,9 +14,9 @@ when: gnocchi_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: gnocchi_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: gnocchi_config.stat.exists diff --git a/ansible/gather/roles/heat/tasks/main.yml b/ansible/gather/roles/heat/tasks/main.yml index 26c4a7a75..1365102ae 100644 --- a/ansible/gather/roles/heat/tasks/main.yml +++ b/ansible/gather/roles/heat/tasks/main.yml @@ -14,9 +14,9 @@ when: heat_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: heat_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: heat_config.stat.exists diff --git a/ansible/gather/roles/keystone/tasks/main.yml b/ansible/gather/roles/keystone/tasks/main.yml index f09901a84..c5d788e52 100644 --- a/ansible/gather/roles/keystone/tasks/main.yml +++ b/ansible/gather/roles/keystone/tasks/main.yml @@ -14,11 +14,11 @@ when: keystone_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: keystone_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: keystone_config.stat.exists - name: Determine if Keystone is deployed in eventlet diff --git a/ansible/gather/roles/neutron/tasks/main.yml b/ansible/gather/roles/neutron/tasks/main.yml index 028636dcb..f6fcc1993 100644 --- a/ansible/gather/roles/neutron/tasks/main.yml +++ b/ansible/gather/roles/neutron/tasks/main.yml @@ -14,10 +14,10 @@ when: neutron_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: neutron_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: neutron_config.stat.exists diff --git a/ansible/gather/roles/nova/tasks/main.yml b/ansible/gather/roles/nova/tasks/main.yml index 1611bdcd5..338519ec2 100644 --- a/ansible/gather/roles/nova/tasks/main.yml +++ b/ansible/gather/roles/nova/tasks/main.yml @@ -14,10 +14,10 @@ when: nova_config.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: nova_config.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: nova_config.stat.exists diff --git a/ansible/gather/roles/undercloud/tasks/main.yml b/ansible/gather/roles/undercloud/tasks/main.yml index 1cfe7329d..d35995a12 100644 --- a/ansible/gather/roles/undercloud/tasks/main.yml +++ b/ansible/gather/roles/undercloud/tasks/main.yml @@ -15,11 +15,11 @@ when: undercloud_conf.stat.exists - name: Fetch output - fetch: src=/tmp/out.yml dest=/tmp/out.yml flat=yes + fetch: src=/tmp/out.yml dest=/tmp/out-{{ inventory_hostname }}.yml flat=yes when: undercloud_conf.stat.exists - name: Load configuration variables - include_vars: /tmp/out.yml + include_vars: /tmp/out-{{ inventory_hostname }}.yml when: undercloud_conf.stat.exists - name: Get max_connections on the database