From 0b0c0b93e303817519c4d1577e1efe7fc8c38e6d Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Wed, 14 Feb 2024 14:02:04 +0300
Subject: [PATCH] Adds support for custom RabbitMQ configuration.

In the upstream down to the 2023.2 this fixed in the
Iff0b28b770753c81ac526afd1ce6f61d77fad25c
this change only for 2023.1 and downstream.

Change-Id: Id7415d5499a56910c72ad2745ca2e6b7f042b102
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
(cherry picked from commit 1410b52c61de9eaf431056976e9557175ac3615d)
---
 ansible/roles/kolla-openstack/defaults/main.yml             | 6 ++++++
 ansible/roles/kolla-openstack/vars/main.yml                 | 5 +++++
 doc/source/configuration/reference/kolla-ansible.rst        | 1 +
 .../notes/add-custom-rabbitmq-conf-8e67ac6a9c7f43e1.yaml    | 3 +++
 4 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/add-custom-rabbitmq-conf-8e67ac6a9c7f43e1.yaml

diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 67e66f559..d62e522c4 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -493,6 +493,12 @@ kolla_extra_placement:
 # Whether to enable Prometheus.
 kolla_enable_prometheus:
 
+###############################################################################
+# RabbitMQ configuration.
+
+# Whether to enable RabbitMQ.
+kolla_enable_rabbitmq:
+
 ###############################################################################
 # Sahara configuration.
 
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 1c1650961..43765e76a 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -219,6 +219,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/prometheus"
     patterns: "*"
     enabled: "{{ kolla_enable_prometheus }}"
+  # RabbitMQ.
+  - src: "{{ kolla_extra_config_path }}/rabbitmq"
+    dest: "{{ kolla_node_custom_config_path }}/rabbitmq"
+    patterns: "*"
+    enabled: "{{ kolla_enable_rabbitmq }}"
   # Sahara.
   - src: "{{ kolla_extra_config_path }}/sahara"
     dest: "{{ kolla_node_custom_config_path }}/sahara"
diff --git a/doc/source/configuration/reference/kolla-ansible.rst b/doc/source/configuration/reference/kolla-ansible.rst
index a33bc3b06..a20551c27 100644
--- a/doc/source/configuration/reference/kolla-ansible.rst
+++ b/doc/source/configuration/reference/kolla-ansible.rst
@@ -737,6 +737,7 @@ which files are supported.
    ``placement.conf``              Placement configuration.
    ``placement/*``                 Extended Placement configuration.
    ``prometheus/*``                Prometheus configuration.
+   ``rabbitmq/*``                  RabbitMQ configuration.
    ``sahara.conf``                 Sahara configuration.
    ``sahara/*``                    Extended sahara configuration.
    ``storm/*``                     Extended Storm configuration.
diff --git a/releasenotes/notes/add-custom-rabbitmq-conf-8e67ac6a9c7f43e1.yaml b/releasenotes/notes/add-custom-rabbitmq-conf-8e67ac6a9c7f43e1.yaml
new file mode 100644
index 000000000..4ff1d738c
--- /dev/null
+++ b/releasenotes/notes/add-custom-rabbitmq-conf-8e67ac6a9c7f43e1.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for custom RabbitMQ configuration.