diff --git a/ansible/roles/ceph/tasks/config.yml b/ansible/roles/ceph/tasks/config.yml
index 21ae654b9d3f3d4ee0af10f0d411ab97888a06c7..6dc826030c7931d426d9b361e59e7c9420deac1f 100644
--- a/ansible/roles/ceph/tasks/config.yml
+++ b/ansible/roles/ceph/tasks/config.yml
@@ -25,6 +25,7 @@
sources:
- "{{ role_path }}/templates/ceph.conf.j2"
- "/etc/kolla/config/ceph.conf"
+ - "/etc/kolla/config/ceph/{{ inventory_hostname }}/ceph.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
with_items:
- "ceph-mon"
diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml
index 5c6e8305e1aad2cea40e14086bf19e31a62a1c09..8adcfc850a84950418c6e01c45fb94d44455e836 100644
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@@ -31,6 +31,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/cinder.conf"
- "/etc/kolla/config/cinder/{{ item }}.conf"
+ - "/etc/kolla/config/cinder/{{ inventory_hostname }}/cinder.conf"
dest: "{{ node_config_directory }}/{{ item }}/cinder.conf"
with_items:
- "cinder-api"
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index ed8cb57b0772fae756a058f171517561fc1f6760..916cac84d8b3e576a2ba05f609537e109f817a43 100644
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@@ -27,6 +27,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/glance.conf"
- "/etc/kolla/config/glance/{{ item }}.conf"
+ - "/etc/kolla/config/glance/{{ inventory_hostname }}/{{ item }}.conf"
dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf"
with_items:
- "glance-api"
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml
index 543598694a3e53b9c8063da6f482bb9ccbed7cf7..0bb0c4139d69fb4859bb588d285ac34f12a9fe93 100644
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@@ -29,6 +29,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/heat.conf"
- "/etc/kolla/config/heat/{{ item }}.conf"
+ - "/etc/kolla/config/heat/{{ inventory_hostname }}/heat.conf"
dest: "{{ node_config_directory }}/{{ item }}/heat.conf"
with_items:
- "heat-api"
diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml
index d4d3e6bd8af85b4016034f7666a3ec2a26bd7a46..b793a69c7914130cfc5cc1fabb3203cd6c621504 100644
--- a/ansible/roles/ironic/tasks/config.yml
+++ b/ansible/roles/ironic/tasks/config.yml
@@ -31,6 +31,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/ironic.conf"
- "/etc/kolla/config/ironic/{{ item }}.conf"
+ - "/etc/kolla/config/ironic/{{ inventory_hostname }}/ironic.conf"
dest: "{{ node_config_directory }}/{{ item }}/ironic.conf"
with_items:
- "ironic-api"
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index 7cd81b0e1e3a2864444aaecd763a789faeb9e48b..bdfe606ec0a9104592251028b94984f73c8925fe 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -24,6 +24,7 @@
- "/etc/kolla/config/database.conf"
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/keystone.conf"
+ - "/etc/kolla/config/keystone/{{ inventory_hostname }}/keystone.conf"
dest: "{{ node_config_directory }}/{{ item }}/keystone.conf"
with_items:
- "keystone"
diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml
index a682766a59e7bc4f5dfb366098f75626bf68faec..bae6f4ef62a1e6ae29eef8fabe84edc76cc6654d 100644
--- a/ansible/roles/magnum/tasks/config.yml
+++ b/ansible/roles/magnum/tasks/config.yml
@@ -27,6 +27,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/magnum.conf"
- "/etc/kolla/config/magnum/{{ item }}.conf"
+ - "/etc/kolla/config/magnum/{{ inventory_hostname }}/magnum.conf"
dest: "{{ node_config_directory }}/{{ item }}/magnum.conf"
with_items:
- "magnum-api"
diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml
index 169350cf7e9ea874b1c3376f4277f2d268780365..b13a2c601d769560fad6bcad867cb9193ba3816d 100644
--- a/ansible/roles/manila/tasks/config.yml
+++ b/ansible/roles/manila/tasks/config.yml
@@ -29,6 +29,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/manila.conf"
- "/etc/kolla/config/manila/{{ item }}.conf"
+ - "/etc/kolla/config/manila/{{ inventory_hostname }}/manila.conf"
dest: "{{ node_config_directory }}/{{ item }}/manila.conf"
with_items:
- "manila-api"
diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml
index 23e48f66f5c90c70e0b1d719bbf24149daf89d42..5c8cbd0ca53f24e366cf58f7586a8f669868ab00 100644
--- a/ansible/roles/mariadb/tasks/config.yml
+++ b/ansible/roles/mariadb/tasks/config.yml
@@ -21,6 +21,7 @@
sources:
- "{{ role_path }}/templates/galera.cnf.j2"
- "/etc/kolla/config/galera.cnf"
+ - "/etc/kolla/config/mariadb/{{ inventory_hostname }}/galera.cnf"
dest: "{{ node_config_directory }}/{{ item }}/galera.cnf"
with_items:
- "mariadb"
diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml
index fc8f8d2c6cd47781b7963b59748ffdb50788cba2..5901e64826886f52d1b952b96106a52e63800abb 100644
--- a/ansible/roles/mistral/tasks/config.yml
+++ b/ansible/roles/mistral/tasks/config.yml
@@ -29,6 +29,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/mistral.conf"
- "/etc/kolla/config/mistral/{{ item }}.conf"
+ - "/etc/kolla/config/mistral/{{ inventory_hostname }}/mistral.conf"
dest: "{{ node_config_directory }}/{{ item }}/mistral.conf"
with_items:
- "mistral-api"
diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml
index edb848f103f3d552a2ec2a1fa70904dd36138fe9..9202c57d8f3b3a61fb592352b990e6a8e099ad87 100644
--- a/ansible/roles/murano/tasks/config.yml
+++ b/ansible/roles/murano/tasks/config.yml
@@ -27,6 +27,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/murano.conf"
- "/etc/kolla/config/murano/{{ item }}.conf"
+ - "/etc/kolla/config/murano/{{ inventory_hostname }}/murano.conf"
dest: "{{ node_config_directory }}/{{ item }}/murano.conf"
with_items:
- "murano-api"
diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 3653a6032a69e706290d31bb06ffd03e27cef247..e8bd8833aa356722f3072310c1c2c2998a4d95bc 100644
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml
@@ -25,6 +25,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/neutron.conf"
- "/etc/kolla/config/neutron/{{ item }}.conf"
+ - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf"
dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/neutron.conf"
with_sequence: start=1 end={{ num_nova_fake_per_node }}
when:
@@ -36,6 +37,7 @@
sources:
- "{{ role_path }}/templates/ml2_conf.ini.j2"
- "/etc/kolla/config/neutron/ml2_conf.ini"
+ - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf"
dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/ml2_conf.ini"
with_sequence: start=1 end={{ num_nova_fake_per_node }}
when:
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 8f7d6d5e961e942b00eff8f643047d36a11284ff..d0ed51d4846be152a29683b14a9c05c437496b73 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -49,6 +49,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/neutron.conf"
- "/etc/kolla/config/neutron/{{ item }}.conf"
+ - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf"
dest: "{{ node_config_directory }}/{{ item }}/neutron.conf"
with_items:
- "neutron-dhcp-agent"
@@ -65,6 +66,7 @@
sources:
- "{{ role_path }}/templates/ml2_conf.ini.j2"
- "/etc/kolla/config/neutron/ml2_conf.ini"
+ - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf"
dest: "{{ node_config_directory }}/{{ item }}/ml2_conf.ini"
with_items:
- "neutron-dhcp-agent"
diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml
index 77311b74d04c58320c7b24d232dd23ebca144ca3..70e109a23e70914b743e25dc397a6aec22698ed8 100644
--- a/ansible/roles/nova/tasks/config-nova-fake.yml
+++ b/ansible/roles/nova/tasks/config-nova-fake.yml
@@ -23,5 +23,6 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/nova.conf"
- "/etc/kolla/config/nova/{{ item }}.conf"
+ - "/etc/kolla/config/nova/{{ inventory_hostname }}/nova.conf"
dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/nova.conf"
with_sequence: start=1 end={{ num_nova_fake_per_node }}
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index cf701f8e17738d5729e7976d4fa5fc8709565172..bd83120c22fc66f76cd75f58d05e4e3ce67ee33c 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -52,6 +52,7 @@
- "/etc/kolla/config/messaging.conf"
- "/etc/kolla/config/nova.conf"
- "/etc/kolla/config/nova/{{ item }}.conf"
+ - "/etc/kolla/config/nova/{{ inventory_hostname }}/nova.conf"
dest: "{{ node_config_directory }}/{{ item }}/nova.conf"
with_items:
- "nova-api"
diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml
index b5cfbf7e513ba6adc25cdc0212b5c3a54e8b16b9..46efe7d45d606eb518ad94623a1921897097860b 100644
--- a/ansible/roles/swift/tasks/config.yml
+++ b/ansible/roles/swift/tasks/config.yml
@@ -52,6 +52,7 @@
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/swift.conf"
- "/etc/kolla/config/swift/{{ item }}.conf"
+ - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf"
with_items:
- "account-auditor"
@@ -78,6 +79,7 @@
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/swift/account.conf"
- "/etc/kolla/config/swift/{{ item }}.conf"
+ - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
with_items:
- "account-auditor"
@@ -94,6 +96,7 @@
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/swift/container.conf"
- "/etc/kolla/config/swift/{{ item }}.conf"
+ - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
with_items:
- "container-auditor"
@@ -110,6 +113,7 @@
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/swift/object.conf"
- "/etc/kolla/config/swift/{{ item }}.conf"
+ - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
with_items:
- "object-auditor"
@@ -126,6 +130,7 @@
- "{{ role_path }}/templates/proxy-server.conf.j2"
- "/etc/kolla/config/global.conf"
- "/etc/kolla/config/swift/{{ item }}.conf"
+ - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf"
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
with_items:
- "proxy-server"