From 6f59b49ab84b0bc2c6550b351069141ae97247c8 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Wed, 14 Feb 2024 20:52:46 +0300 Subject: [PATCH] Fix the glob for the custom RabbitMQ configuration Followup on Id4588f4529a4522e68e22ce58711cb927fa68a9d to fix the place of the RabbitMQ configuration and there are not only the rabbitmq.conf and rabbitmq-env.conf but also advanced.config which also often customized and more other files. Change-Id: Iff0b28b770753c81ac526afd1ce6f61d77fad25c Signed-off-by: Maksim Malchuk --- ansible/roles/kolla-openstack/defaults/main.yml | 2 +- .../notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml index 5a7a96b09..dd62864b7 100644 --- a/ansible/roles/kolla-openstack/defaults/main.yml +++ b/ansible/roles/kolla-openstack/defaults/main.yml @@ -266,7 +266,7 @@ kolla_openstack_custom_config_rules_default: - glob: "**/multipath.conf" strategy: template priority: 1000 - - glob: "**/rabbitmq*.conf" + - glob: "rabbitmq/**/*" strategy: template priority: 1000 - glob: "**/*wsgi*.conf" diff --git a/releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml b/releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml new file mode 100644 index 000000000..b47d7f567 --- /dev/null +++ b/releasenotes/notes/add-custom-rabbitmq-conf-7c3927e1024f0be1.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Added fix for the custom RabbitMQ configuration. Fixed incorrect path and + glob, so now you can template also all other configuration files such as + ``advanced.config``, ``definitions.json``, ``enabled_plugins``, and + ``erl_inetrc`` together with ``rabbitmq.conf`` and ``rabbitmq-env.conf``.