Merge "Simplify Openstack services configuration possibilities"

2017-09-26 15:49:22 +00:00 · 2017-09-26 15:49:22 +00:00 · 9cdbae707b
commit 9cdbae707b
parent 345eced125 a3dfdfc085
35 changed files with 17 additions and 69 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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:

--- a/releasenotes/notes/simplify-global-config-generation-8f42cea604ba1cf2.yaml
+++ 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.