Merge "Add support for custom Masakari configuration"

ansible/kolla-openstack.yml

@@ -122,6 +122,7 @@
             - { name: manila, file: manila.conf }
             - { name: mariabackup, file: backup.my.cnf }
             - { name: mariadb, file: galera.cnf }
+            - { name: masakari, file: masakari.conf }
             - { name: murano, file: murano.conf }
             - { name: neutron, file: neutron.conf }
             - { name: neutron_ml2, file: neutron/ml2_conf.ini }
@@ -229,6 +230,7 @@
       kolla_extra_manila: "{{ kolla_extra_config.manila | default }}"
       kolla_extra_mariabackup: "{{ kolla_extra_config.mariabackup | default }}"
       kolla_extra_mariadb: "{{ kolla_extra_config.mariadb | default }}"
+      kolla_extra_masakari: "{{ kolla_extra_config.masakari | default }}"
       kolla_extra_murano: "{{ kolla_extra_config.murano | default }}"
       kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"
       kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"

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

@@ -352,6 +352,15 @@ kolla_extra_mariadb:
 # Whether to enable Manila.
 kolla_enable_manila:
 
+###############################################################################
+# Masakari configuration.
+
+# Whether to enable Masakari.
+kolla_enable_masakari:
+
+# Free form extra configuration to append to masakari.conf.
+kolla_extra_masakari:
+
 ###############################################################################
 # Monasca configuration.
 

ansible/roles/kolla-openstack/molecule/default/tests/test_default.py

@@ -50,6 +50,7 @@ def test_service_config_directory(host, path):
      'magnum',
      'manila',
      'mariadb',
+     'masakari',
      'monasca',
      'murano',
      'neutron',

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

@@ -89,6 +89,10 @@ provisioner:
         kolla_extra_mariadb: |
           [extra-galera.cnf]
           foo=bar
+        kolla_enable_masakari: true
+        kolla_extra_masakari: |
+          [extra-masakari.conf]
+          foo=bar
         kolla_enable_monasca: true
         kolla_enable_murano: true
         kolla_extra_murano: |

ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py

@@ -43,6 +43,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'magnum',
      'manila',
      'mariadb',
+     'masakari',
      'monasca',
      'murano',
      'neutron',
@@ -73,8 +74,9 @@ def test_service_config_directory(host, path):
      'keystone.conf',
      'magnum.conf',
      'manila.conf',
-     'neutron/ml2_conf.ini',
+     'masakari.conf',
      'murano.conf',
+     'neutron/ml2_conf.ini',
      'neutron.conf',
      'nova.conf',
      'octavia.conf',

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

@@ -31,6 +31,7 @@
     - { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" }
     - { src: manila.conf.j2, dest: manila.conf, enabled: "{{ kolla_enable_manila }}" }
     - { src: backup.my.cnf.j2, dest: backup.my.cnf, enabled: "{{ kolla_enable_mariabackup }}" }
+    - { src: masakari.conf.j2, dest: masakari.conf, enabled: "{{ kolla_enable_masakari }}" }
     - { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" }
     - { src: murano.conf.j2, dest: murano.conf, enabled: "{{ kolla_enable_murano }}" }
     - { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" }

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

@@ -0,0 +1,10 @@
+# {{ ansible_managed }}
+
+{% if kolla_extra_masakari %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_masakari }}
+{% endif %}
+

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

@@ -142,6 +142,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/mariadb"
     patterns: "*"
     enabled: "{{ kolla_enable_mariadb }}"
+  # Masakari.
+  - src: "{{ kolla_extra_config_path }}/masakari"
+    dest: "{{ kolla_node_custom_config_path }}/masakari"
+    patterns: "*"
+    enabled: "{{ kolla_enable_masakari }}"
   # Monasca.
   - src: "{{ kolla_extra_config_path }}/monasca"
     dest: "{{ kolla_node_custom_config_path }}/monasca"

doc/source/configuration/kolla-ansible.rst

@@ -544,6 +544,8 @@ which files are supported.
    ``manila.conf``                 Manila configuration.
    ``manila/*``                    Extended manila configuration.
    ``mariadb/*``                   Extended MariaDB configuration.
+   ``masakari.conf``               Masakari configuration.
+   ``masakari/*``                  Extended masakari configuration.
    ``monasca/*``                   Extended Monasca configuration.
    ``murano.conf``                 Murano configuration.
    ``murano/*``                    Extended murano configuration.

releasenotes/notes/add-support-for-custom-masakari-conf-af224cead3cd1ad4.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for custom Masakari configuration.