Adds support for custom Multipathd configuration.

Change-Id: Ia956cfea7e7bfe47bf1e73c9edcac602caf45579
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2023-03-31 18:39:56 +03:00
parent 137e64b57c
commit 25fe761e62
8 changed files with 30 additions and 0 deletions

View File

@ -128,6 +128,7 @@
- { name: mariabackup, file: backup.my.cnf }
- { name: mariadb, file: galera.cnf }
- { name: masakari, file: masakari.conf }
- { name: multipathd, file: multipath.conf }
- { name: murano, file: murano.conf }
- { name: neutron, file: neutron.conf }
- { name: neutron_ml2, file: neutron/ml2_conf.ini }
@ -237,6 +238,7 @@
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_multipathd: "{{ kolla_extra_config.multipathd | 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 }}"

View File

@ -358,6 +358,15 @@ kolla_enable_masakari:
# Free form extra configuration to append to masakari.conf.
kolla_extra_masakari:
###############################################################################
# Multipathd configuration.
# Whether to enable Multipathd.
kolla_enable_multipathd:
# Free form extra configuration to append to multipath.conf.
kolla_extra_multipathd:
###############################################################################
# Murano configuration.

View File

@ -98,6 +98,10 @@ provisioner:
kolla_extra_masakari: |
[extra-masakari.conf]
foo=bar
kolla_enable_multipathd: true
kolla_extra_multipathd: |
[extra-multipath.conf]
foo=bar
kolla_enable_murano: true
kolla_extra_murano: |
[extra-murano.conf]

View File

@ -76,6 +76,7 @@ def test_service_config_directory(host, path):
'magnum.conf',
'manila.conf',
'masakari.conf',
'multipath.conf',
'murano.conf',
'neutron/ml2_conf.ini',
'neutron.conf',

View File

@ -34,6 +34,7 @@
- { 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: multipath.conf.j2, dest: multipath.conf, enabled: "{{ kolla_enable_multipathd }}" }
- { src: murano.conf.j2, dest: murano.conf, enabled: "{{ kolla_enable_murano }}" }
- { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" }
- { src: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" }

View File

@ -0,0 +1,9 @@
# {{ ansible_managed }}
{% if kolla_extra_multipathd %}
#######################
# Extra configuration
#######################
{{ kolla_extra_multipathd }}
{% endif %}

View File

@ -707,6 +707,7 @@ which files are supported.
``mariadb/*`` Extended MariaDB configuration.
``masakari.conf`` Masakari configuration.
``masakari/*`` Extended masakari configuration.
``multipath.conf`` Multipathd configuration.
``murano.conf`` Murano configuration.
``murano/*`` Extended murano configuration.
``neutron.conf`` Neutron configuration.

View File

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