Merge "Add support for overriding OpenStack configuration globally"

ansible/kolla-openstack.yml

@@ -107,6 +107,7 @@
             - { name: cinder, file: cinder.conf }
             - { name: designate, file: designate.conf }
             - { name: glance, file: glance.conf }
+            - { name: global, file: global.conf }
             - { name: gnocchi, file: gnocchi.conf }
             - { name: grafana, file: grafana.ini }
             - { name: heat, file: heat.conf }
@@ -214,6 +215,7 @@
       kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"
       kolla_extra_designate: "{{ kolla_extra_config.designate | default }}"
       kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
+      kolla_extra_global: "{{ kolla_extra_config.global | default }}"
       kolla_extra_gnocchi: "{{ kolla_extra_config.gnocchi | default }}"
       kolla_extra_grafana: "{{ kolla_extra_config.grafana | default }}"
       kolla_extra_heat: "{{ kolla_extra_config.heat | default }}"

ansible/roles/kolla-openstack/defaults/main.yml

@@ -5,6 +5,12 @@ kolla_extra_config_path:
 # Directory where Kolla custom configuration files will be installed.
 kolla_node_custom_config_path: /etc/kolla/config
 
+###############################################################################
+# Global configuration.
+
+# Free form extra configuration to append to global.conf.
+kolla_extra_global:
+
 ###############################################################################
 # Barbican configuration.
 

ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml

@@ -34,6 +34,8 @@ provisioner:
         kolla_extra_glance: |
           [extra-glance.conf]
           foo=bar
+        kolla_extra_global: |
+          [extra-global.conf]
         kolla_enable_gnocchi: true
         kolla_extra_gnocchi: |
           [extra-gnocchi.conf]

ansible/roles/kolla-openstack/tasks/config.yml

@@ -19,6 +19,7 @@
     - { src: designate.conf.j2, dest: designate.conf, enabled: "{{ kolla_enable_designate }}" }
     - { src: galera.cnf.j2, dest: galera.cnf, enabled: "{{ kolla_enable_mariadb }}" }
     - { src: glance.conf.j2, dest: glance.conf, enabled: "{{ kolla_enable_glance }}" }
+    - { src: global.conf.j2, dest: global.conf, enabled: true }
     - { src: gnocchi.conf.j2, dest: gnocchi.conf, enabled: "{{ kolla_enable_gnocchi }}" }
     - { src: grafana.ini.j2, dest: grafana.ini, enabled: "{{ kolla_enable_grafana }}" }
     - { src: heat.conf.j2, dest: heat.conf, enabled: "{{ kolla_enable_heat }}" }

ansible/roles/kolla-openstack/templates/global.conf.j2

+# {{ ansible_managed }}
+
+{% if kolla_extra_global %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_global }}
+{% endif %}

doc/source/configuration/kolla-ansible.rst

@@ -164,6 +164,7 @@ which files are supported.
    ``fluentd/output``              Fluentd output configuration.
    ``glance.conf``                 Glance configuration.
    ``glance/*``                    Extended Glance configuration.
+   ``global.conf``                 Global configuration for all OpenStack services.
    ``gnocchi.conf``                Gnocchi configuration.
    ``gnocchi/*``                   Extended Gnocchi configuration.
    ``grafana/*``                   Extended Grafana configuration.

releasenotes/notes/add-support-for-global-conf-411316a7250611b4.yaml

+---
+features:
+  - Adds support for overriding configuration globally for all OpenStack
+    services by generating a ``global.conf`` file for use by Kolla Ansible.
+    See `story 2005904 <https://storyboard.openstack.org/#!/story/2005904>`__
+    for details.