diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml
index 051e15076339e7402d8c3cc1620d240025001dd7..36565fcbf4b172d12c5a7a4a15868eb5bb46834e 100644
--- a/ansible/roles/aodh/tasks/config.yml
+++ b/ansible/roles/aodh/tasks/config.yml
@@ -31,8 +31,6 @@
sources:
- "{{ role_path }}/templates/aodh.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/aodh.conf"
- "{{ node_custom_config }}/aodh/{{ item.key }}.conf"
- "{{ node_custom_config }}/aodh/{{ inventory_hostname }}/aodh.conf"
diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml
index d3309b845bb14eed53744d6c9062bd0fa5a0b7d8..04449c2b4e30270b2d990fd86f138910018b14ec 100644
--- a/ansible/roles/barbican/tasks/config.yml
+++ b/ansible/roles/barbican/tasks/config.yml
@@ -67,8 +67,6 @@
sources:
- "{{ role_path }}/templates/barbican.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/barbican.conf"
- "{{ node_custom_config }}/barbican/{{ item.key }}.conf"
- "{{ node_custom_config }}/barbican/{{ inventory_hostname }}/barbican.conf"
diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml
index 8d8783edf1851a0b290d2f848f2f1a37f09451c2..23664fd6d6c190e96630b9c90dfb240147ed5ab8 100644
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@@ -30,8 +30,6 @@
sources:
- "{{ role_path }}/templates/ceilometer.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/ceilometer.conf"
- "{{ node_custom_config }}/ceilometer/{{ item.key }}.conf"
- "{{ node_custom_config }}/ceilometer/{{ inventory_hostname }}/ceilometer.conf"
diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml
index d1e6db03dd5f6c80f4318ccb5aaf0ab2d1e1125b..59b2ff225a43aaaa07a0a6d91f53e72d3b2d2620 100644
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@@ -48,8 +48,6 @@
sources:
- "{{ role_path }}/templates/cinder.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/cinder.conf"
- "{{ node_custom_config }}/cinder/{{ item.key }}.conf"
- "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/cinder.conf"
diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml
index 4b04cffedd5802a5001c3df21326a3a1d21fe7fb..d5616a7502600a1a4d4042eebcfd92c9b7a2df01 100644
--- a/ansible/roles/cloudkitty/tasks/config.yml
+++ b/ansible/roles/cloudkitty/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/cloudkitty.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/cloudkitty.conf"
- "{{ node_custom_config }}/cloudkitty/{{ item.key }}.conf"
- "{{ node_custom_config }}/cloudkitty/{{ inventory_hostname }}/cloudkitty.conf"
diff --git a/ansible/roles/congress/tasks/config.yml b/ansible/roles/congress/tasks/config.yml
index b8ee831a46a4491edeaea3c7dc784acf6ed939bb..f8293f68aa928721d3c46576f6d3239f31236a73 100644
--- a/ansible/roles/congress/tasks/config.yml
+++ b/ansible/roles/congress/tasks/config.yml
@@ -26,8 +26,6 @@
sources:
- "{{ role_path }}/templates/congress.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/congress.conf"
- "{{ node_custom_config }}/congress/{{ item.key }}.conf"
- "{{ node_custom_config }}/congress/{{ inventory_hostname }}/congress.conf"
diff --git a/ansible/roles/designate/tasks/config.yml b/ansible/roles/designate/tasks/config.yml
index cbe226f2239dfd1c2a85bf3f713a9578e562449e..7be26199595b631e5a40bbcb1dae62033eb8dde1 100644
--- a/ansible/roles/designate/tasks/config.yml
+++ b/ansible/roles/designate/tasks/config.yml
@@ -33,8 +33,6 @@
sources:
- "{{ role_path }}/templates/designate.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/designate.conf"
- "{{ node_custom_config }}/designate/{{ item.key }}.conf"
- "{{ node_custom_config }}/designate/{{ inventory_hostname }}/designate.conf"
diff --git a/ansible/roles/freezer/tasks/config.yml b/ansible/roles/freezer/tasks/config.yml
index e455be67c464bcaee31cac078fa70d542fa7a44d..832bdd18cbec2c93a654f5737ab3dd852ab0bf91 100644
--- a/ansible/roles/freezer/tasks/config.yml
+++ b/ansible/roles/freezer/tasks/config.yml
@@ -40,8 +40,6 @@
sources:
- "{{ role_path }}/templates/freezer-api.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/freezer.conf"
- "{{ node_custom_config }}/freezer/{{ item.key }}.conf"
- "{{ node_custom_config }}/freezer/{{ inventory_hostname }}/{{ item.key }}.conf"
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index 612ebcabbdaca17d0400d8217c9cc36cbd7b6fcc..8f4e3a813dab5ceb1b0959bffe4b60d82590a302 100644
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/{{ item.key }}.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/glance.conf"
- "{{ node_custom_config }}/glance/{{ item.key }}.conf"
- "{{ node_custom_config }}/glance/{{ inventory_hostname }}/{{ item.key }}.conf"
diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml
index 56d20a3c8466575bdfcdc629c1a1c68ecd9b8af4..5c49e3184f3c59603817d096257bda5d47c1cfd4 100644
--- a/ansible/roles/gnocchi/tasks/config.yml
+++ b/ansible/roles/gnocchi/tasks/config.yml
@@ -30,8 +30,6 @@
sources:
- "{{ role_path }}/templates/gnocchi.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/gnocchi.conf"
- "{{ node_custom_config }}/gnocchi/{{ item.key }}.conf"
- "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/gnocchi.conf"
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml
index 63fc5ed3106233f531a4a400a9471caf2e2976a0..4a5e4276f1cd368c802cc0279940c7816acd2022 100644
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@@ -37,8 +37,6 @@
sources:
- "{{ role_path }}/templates/heat.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/heat.conf"
- "{{ node_custom_config }}/heat/{{ item.key }}.conf"
- "{{ node_custom_config }}/heat/{{ inventory_hostname }}/heat.conf"
diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml
index 417a9b42fbdba67902c713566dcff594ff380210..fd51d76b9374681af77596a01c4366ce322d24fe 100644
--- a/ansible/roles/ironic/tasks/config.yml
+++ b/ansible/roles/ironic/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/ironic.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/ironic.conf"
- "{{ node_custom_config }}/ironic/{{ item }}.conf"
- "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic.conf"
@@ -46,8 +44,6 @@
sources:
- "{{ role_path }}/templates/ironic-inspector.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/ironic-inspector.conf"
- "{{ node_custom_config }}/ironic-inspector/inspector.conf"
- "{{ node_custom_config }}/ironic-inspector/{{ inventory_hostname }}/inspector.conf"
diff --git a/ansible/roles/karbor/tasks/config.yml b/ansible/roles/karbor/tasks/config.yml
index db72fd192c73dd12d5988659e67a78fcad5755ce..09dd01298a128a94d55d9033b9b42cb0e111f403 100644
--- a/ansible/roles/karbor/tasks/config.yml
+++ b/ansible/roles/karbor/tasks/config.yml
@@ -30,8 +30,6 @@
sources:
- "{{ role_path }}/templates/karbor.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/karbor.conf"
- "{{ node_custom_config }}/karbor/{{ item.key }}.conf"
- "{{ node_custom_config }}/karbor/{{ inventory_hostname }}/karbor.conf"
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index 285df59f728e1c0846b17a26be754713cf449348..8fcf529de59e006719acc6f5d67a4f4a61a17e01 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -40,8 +40,6 @@
sources:
- "{{ role_path }}/templates/keystone.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/keystone.conf"
- "{{ node_custom_config }}/keystone/{{ item.key }}.conf"
- "{{ node_custom_config }}/keystone/{{ inventory_hostname }}/keystone.conf"
diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml
index 2148780bbfde1f30078964ee49cc0f3c8bedbf44..dd596b3724ba82b2617969c701df902a28f7c25d 100644
--- a/ansible/roles/kuryr/tasks/config.yml
+++ b/ansible/roles/kuryr/tasks/config.yml
@@ -28,8 +28,6 @@
sources:
- "{{ role_path }}/templates/kuryr.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/kuryr.conf"
- "{{ node_custom_config }}/kuryr/{{ item.key }}.conf"
- "{{ node_custom_config }}/kuryr/{{ inventory_hostname }}/{{ item.key }}.conf"
diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml
index 232099b6c6d17dc179ea4c2cc41db5b783508402..e4718ac54ca8b721c22352390b9003647bcce476 100644
--- a/ansible/roles/magnum/tasks/config.yml
+++ b/ansible/roles/magnum/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/magnum.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/magnum.conf"
- "{{ node_custom_config }}/magnum/{{ item.key }}.conf"
- "{{ node_custom_config }}/magnum/{{ inventory_hostname }}/magnum.conf"
diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml
index 4d730cd7ca0f1ed01d10ff87d31f81b556deb9ef..c280347bb361912304340d4089fc219fa3812428 100644
--- a/ansible/roles/manila/tasks/config.yml
+++ b/ansible/roles/manila/tasks/config.yml
@@ -28,8 +28,6 @@
sources:
- "{{ role_path }}/templates/manila.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/manila.conf"
- "{{ node_custom_config }}/manila/{{ item.key }}.conf"
- "{{ node_custom_config }}/manila/{{ inventory_hostname }}/manila.conf"
@@ -54,8 +52,6 @@
- "{{ role_path }}/templates/manila.conf.j2"
- "{{ role_path }}/templates/manila-share.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/manila.conf"
- "{{ node_custom_config }}/{{ item }}.conf"
- "{{ node_custom_config }}/manila/{{ item }}.conf"
diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml
index 73f6c6fb7d8f086eb3628173dd09b2b3875dd6b4..cdbd12eceac0872ccf421f00677cc1793fbfdd49 100644
--- a/ansible/roles/mistral/tasks/config.yml
+++ b/ansible/roles/mistral/tasks/config.yml
@@ -26,8 +26,6 @@
sources:
- "{{ role_path }}/templates/mistral.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/mistral.conf"
- "{{ node_custom_config }}/mistral/{{ item.key }}.conf"
- "{{ node_custom_config }}/mistral/{{ inventory_hostname }}/mistral.conf"
diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml
index da754df815c62bc516bdac4b45c4492c0d6addf0..c1e2a762402e9adadbb2aea93260eb70262637d9 100644
--- a/ansible/roles/murano/tasks/config.yml
+++ b/ansible/roles/murano/tasks/config.yml
@@ -23,8 +23,6 @@
sources:
- "{{ role_path }}/templates/murano.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/murano.conf"
- "{{ node_custom_config }}/murano/{{ item }}.conf"
- "{{ node_custom_config }}/murano/{{ inventory_hostname }}/murano.conf"
diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 745566f698c89ab6c0feaa2bbab5900f78b45d39..6736d94ca8ba79c38a5e42038e72953aa3cc174d 100644
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml
@@ -24,8 +24,6 @@
sources:
- "{{ role_path }}/templates/neutron.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/neutron.conf"
- "{{ node_custom_config }}/neutron/{{ item }}.conf"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 766eb471ff5914ffe34bd5990118bd2dc3c29131..8245cdf15c084fcdc1d71d63da37ff62f9c319e2 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -52,8 +52,6 @@
sources:
- "{{ role_path }}/templates/neutron.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/neutron.conf"
- "{{ node_custom_config }}/neutron/{{ item.key }}.conf"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml
index 5a7ccd14c22b36d2b88e671caaf5b7848ff15f87..d005cdc94e470f0bd37dbecf3a6105bd88a23adc 100644
--- a/ansible/roles/nova/tasks/config-nova-fake.yml
+++ b/ansible/roles/nova/tasks/config-nova-fake.yml
@@ -23,8 +23,6 @@
sources:
- "{{ role_path }}/templates/nova.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/nova.conf"
- "{{ node_custom_config }}/nova/{{ item }}.conf"
- "{{ node_custom_config }}/nova/{{ inventory_hostname }}/nova.conf"
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index 2af2fded292a09093cb08cb72213087d35d6e7a2..f540f06989f79bc992138cc3d628fc2ab5432615 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -50,8 +50,6 @@
sources:
- "{{ role_path }}/templates/nova.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/nova.conf"
- "{{ node_custom_config }}/nova/{{ item.key }}.conf"
- "{{ node_custom_config }}/nova/{{ inventory_hostname }}/nova.conf"
diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml
index 93db2bcb320f53bc3186c6a134b15facde22a590..87acabb6f3e23fbed7e7d6e5e9b63b53d952735a 100644
--- a/ansible/roles/octavia/tasks/config.yml
+++ b/ansible/roles/octavia/tasks/config.yml
@@ -28,8 +28,6 @@
sources:
- "{{ role_path }}/templates/octavia.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/octavia.conf"
- "{{ node_custom_config }}/octavia/{{ item.key }}.conf"
- "{{ node_custom_config }}/octavia/{{ inventory_hostname }}/octavia.conf"
diff --git a/ansible/roles/panko/tasks/config.yml b/ansible/roles/panko/tasks/config.yml
index bb5741331d62c49455bf631dbf87e8be1c1f5460..581f85e257285df2f236ce963ef20461fb05ab63 100644
--- a/ansible/roles/panko/tasks/config.yml
+++ b/ansible/roles/panko/tasks/config.yml
@@ -28,8 +28,6 @@
sources:
- "{{ role_path }}/templates/panko.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/panko.conf"
- "{{ node_custom_config }}/panko/{{ item.key }}.conf"
- "{{ node_custom_config }}/panko/{{ inventory_hostname }}/{{ item.key }}.conf"
diff --git a/ansible/roles/sahara/tasks/config.yml b/ansible/roles/sahara/tasks/config.yml
index 64c6990e3d6c7835cbb9b15a504e9ad31ed9f9d6..fdca318b185cf278692de3d43d186679fe6b380f 100644
--- a/ansible/roles/sahara/tasks/config.yml
+++ b/ansible/roles/sahara/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/sahara.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/sahara.conf"
- "{{ node_custom_config }}/sahara/{{ item.key }}.conf"
- "{{ node_custom_config }}/sahara/{{ inventory_hostname }}/sahara.conf"
diff --git a/ansible/roles/searchlight/tasks/config.yml b/ansible/roles/searchlight/tasks/config.yml
index 717521f68d0475222443bb455f6d69a555ec77b9..129693d8f13c26278036a0b4631add88dfc980b8 100644
--- a/ansible/roles/searchlight/tasks/config.yml
+++ b/ansible/roles/searchlight/tasks/config.yml
@@ -26,7 +26,6 @@
sources:
- "{{ role_path }}/templates/searchlight.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/searchlight.conf"
- "{{ node_custom_config }}/searchlight/{{ inventory_hostname }}/searchlight.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/searchlight.conf"
diff --git a/ansible/roles/senlin/tasks/config.yml b/ansible/roles/senlin/tasks/config.yml
index e4442ec4fe47fddcb2dc76243a1d0d868e066a92..fe50e6f78ecf5b871f05327af1c7a8959a2682b2 100644
--- a/ansible/roles/senlin/tasks/config.yml
+++ b/ansible/roles/senlin/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/senlin.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/senlin.conf"
- "{{ node_custom_config }}/senlin/{{ item.key }}.conf"
- "{{ node_custom_config }}/senlin/{{ inventory_hostname }}/senlin.conf"
diff --git a/ansible/roles/solum/tasks/config.yml b/ansible/roles/solum/tasks/config.yml
index 7df07c41b4d86aa4e93a328774fa1caba181c44e..1061f16853fca03c4250945e1ed4f0bc9aeaf8e1 100644
--- a/ansible/roles/solum/tasks/config.yml
+++ b/ansible/roles/solum/tasks/config.yml
@@ -31,8 +31,6 @@
sources:
- "{{ role_path }}/templates/solum.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/solum.conf"
- "{{ node_custom_config }}/solum/{{ item.key }}.conf"
- "{{ node_custom_config }}/solum/{{ inventory_hostname }}/solum.conf"
diff --git a/ansible/roles/tacker/tasks/config.yml b/ansible/roles/tacker/tasks/config.yml
index 6702bcd20c8cf412689b20bad34f50e0ea2812e9..df1d20f0086d02faaeb787aba0220f532375a1d6 100644
--- a/ansible/roles/tacker/tasks/config.yml
+++ b/ansible/roles/tacker/tasks/config.yml
@@ -29,8 +29,6 @@
sources:
- "{{ role_path }}/templates/tacker.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/tacker.conf"
- "{{ node_custom_config }}/tacker/{{ item.key }}.conf"
- "{{ node_custom_config }}/tacker/{{ inventory_hostname }}/tacker.conf"
diff --git a/ansible/roles/trove/tasks/config.yml b/ansible/roles/trove/tasks/config.yml
index a05f5eaad675eb6c08b463ef689efa195f0945fe..8cb2473d37c0ab34243e2f161b7e1e1121909a4f 100644
--- a/ansible/roles/trove/tasks/config.yml
+++ b/ansible/roles/trove/tasks/config.yml
@@ -42,8 +42,6 @@
sources:
- "{{ role_path }}/templates/trove.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/trove.conf"
- "{{ node_custom_config }}/trove/{{ item.key }}.conf"
- "{{ node_custom_config }}/trove/{{ inventory_hostname }}/trove.conf"
diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml
index d9d0858b6e8b55c19abf8b1c523ed55b8a11f838..5b06d602ffdb6dae271257640acc2ee37db60e3e 100644
--- a/ansible/roles/watcher/tasks/config.yml
+++ b/ansible/roles/watcher/tasks/config.yml
@@ -30,8 +30,6 @@
sources:
- "{{ role_path }}/templates/watcher.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/watcher.conf"
- "{{ node_custom_config }}/watcher/{{ item.key }}.conf"
- "{{ node_custom_config }}/watcher/{{ inventory_hostname }}/watcher.conf"
diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml
index 7dca74168966840bbf6174c63a16a5d8a9a03e7e..5787f3e395c952c5307001d1ea96c9571e76dc11 100644
--- a/ansible/roles/zun/tasks/config.yml
+++ b/ansible/roles/zun/tasks/config.yml
@@ -27,8 +27,6 @@
sources:
- "{{ role_path }}/templates/zun.conf.j2"
- "{{ node_custom_config }}/global.conf"
- - "{{ node_custom_config }}/database.conf"
- - "{{ node_custom_config }}/messaging.conf"
- "{{ node_custom_config }}/zun.conf"
- "{{ node_custom_config }}/zun/{{ item.key }}.conf"
- "{{ node_custom_config }}/zun/{{ inventory_hostname }}/zun.conf"
diff --git a/doc/source/user/advanced-configuration.rst b/doc/source/user/advanced-configuration.rst
index 0b97bff6bd412c757d63d20196cb465b305171bc..05112494de4b1e62ea18dd32cb2e7a0e8c3bb521 100644
--- a/doc/source/user/advanced-configuration.rst
+++ b/doc/source/user/advanced-configuration.rst
@@ -181,6 +181,17 @@ on host myhost, the operator needs to create file
[DEFAULT]
ram_allocation_ratio = 5.0
+Kolla allows the operator to override configuration globally for all services.
+It will look for a file called ``/etc/kolla/config/global.conf``.
+
+For example to modify database pool size connection for all services, the
+operator needs to create ``/etc/kolla/config/global.conf`` with content:
+
+::
+
+ [database]
+ max_pool_size = 100
+
The operator can make these changes after services were already deployed by
using following command:
diff --git a/releasenotes/notes/simplify-global-config-generation-8f42cea604ba1cf2.yaml b/releasenotes/notes/simplify-global-config-generation-8f42cea604ba1cf2.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8e0c9e73da772f0771387bfc2c118d9f84e14056
--- /dev/null
+++ b/releasenotes/notes/simplify-global-config-generation-8f42cea604ba1cf2.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ The following files /etc/kolla/config/database.conf and /etc/kolla/config/messaging.conf
+ used to generate Openstack services config files are redundant with /etc/kolla/config/global.conf.
+ They have been removed in order to simplify codebase.