From bc3252900804ae1fc67cbf4cf3f04f1b2922c452 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 31 Jul 2020 14:38:22 +0000 Subject: [PATCH] Add support for custom Masakari configuration Change-Id: Ibcf12f4d80bd9744867688ba986cd59be82f3e5a Story: 2007969 Task: 40470 --- ansible/kolla-openstack.yml | 2 ++ ansible/roles/kolla-openstack/defaults/main.yml | 9 +++++++++ .../molecule/default/tests/test_default.py | 1 + .../molecule/enable-everything/molecule.yml | 4 ++++ .../molecule/enable-everything/tests/test_default.py | 4 +++- ansible/roles/kolla-openstack/tasks/config.yml | 1 + .../roles/kolla-openstack/templates/masakari.conf.j2 | 10 ++++++++++ ansible/roles/kolla-openstack/vars/main.yml | 5 +++++ doc/source/configuration/kolla-ansible.rst | 2 ++ ...port-for-custom-masakari-conf-af224cead3cd1ad4.yaml | 3 +++ 10 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ansible/roles/kolla-openstack/templates/masakari.conf.j2 create mode 100644 releasenotes/notes/add-support-for-custom-masakari-conf-af224cead3cd1ad4.yaml diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml index 27c24b2c6..a77776ffd 100644 --- a/ansible/kolla-openstack.yml +++ b/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 }}" diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml index 42d16bb6e..7e5017cbe 100644 --- a/ansible/roles/kolla-openstack/defaults/main.yml +++ b/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. diff --git a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py index 04233d0f3..69a6c1d4f 100644 --- a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py +++ b/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', diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml index 008e29b09..a9e68b759 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml +++ b/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: | diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py index 649608c7b..d4bc9f2ea 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py +++ b/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', diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml index 60a9b6053..ab16323b8 100644 --- a/ansible/roles/kolla-openstack/tasks/config.yml +++ b/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 }}" } diff --git a/ansible/roles/kolla-openstack/templates/masakari.conf.j2 b/ansible/roles/kolla-openstack/templates/masakari.conf.j2 new file mode 100644 index 000000000..5a6848c8f --- /dev/null +++ b/ansible/roles/kolla-openstack/templates/masakari.conf.j2 @@ -0,0 +1,10 @@ +# {{ ansible_managed }} + +{% if kolla_extra_masakari %} +####################### +# Extra configuration +####################### + +{{ kolla_extra_masakari }} +{% endif %} + diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml index 07942f2d2..4a98a8a62 100644 --- a/ansible/roles/kolla-openstack/vars/main.yml +++ b/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" diff --git a/doc/source/configuration/kolla-ansible.rst b/doc/source/configuration/kolla-ansible.rst index 67a408a2a..0e94a6e7b 100644 --- a/doc/source/configuration/kolla-ansible.rst +++ b/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. diff --git a/releasenotes/notes/add-support-for-custom-masakari-conf-af224cead3cd1ad4.yaml b/releasenotes/notes/add-support-for-custom-masakari-conf-af224cead3cd1ad4.yaml new file mode 100644 index 000000000..3281385b3 --- /dev/null +++ b/releasenotes/notes/add-support-for-custom-masakari-conf-af224cead3cd1ad4.yaml @@ -0,0 +1,3 @@ +--- +features: + - Adds support for custom Masakari configuration.