From 7782d598d75588448e46283aaed7cb171c82283f Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 25 Oct 2024 12:09:14 +0200
Subject: [PATCH] Add support for building the proxysql image

This should have been added when proxysql was added to kolla [1] and
kolla-ansible [2].

ProxySQL is disabled by default in this change to allow backports. It
will be enabled in a follow-up patch only for the master branch.

[1] https://review.opendev.org/c/openstack/kolla/+/769385
[2] https://review.opendev.org/c/openstack/kolla-ansible/+/770215

Change-Id: I683b685bf4e2f625144e4656bcd69c03eda7aa51
(cherry picked from commit 3b1b81b3a65c615cf10f1f49c017e879469dd2b8)
---
 ansible/inventory/group_vars/all/kolla                       | 3 +++
 .../notes/build-proxysql-image-ec09332ef0b7dae0.yaml         | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/build-proxysql-image-ec09332ef0b7dae0.yaml

diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
index fd7f26be1..6019832f3 100644
--- a/ansible/inventory/group_vars/all/kolla
+++ b/ansible/inventory/group_vars/all/kolla
@@ -225,6 +225,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_placement | bool }}"
   - regex: ^prometheus
     enabled: "{{ kolla_enable_prometheus | bool }}"
+  - regex: ^proxysql
+    enabled: "{{ kolla_enable_proxysql | bool }}"
   - regex: ^qdrouterd
     enabled: "{{ kolla_enable_qdrouterd | bool }}"
   - regex: ^rabbitmq
@@ -505,6 +507,7 @@ kolla_enable_mariadb: "yes"
 kolla_enable_memcached: "yes"
 kolla_enable_neutron: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_nova: "{{ kolla_enable_openstack_core | bool }}"
+kolla_enable_proxysql: "no"
 kolla_enable_rabbitmq: "yes"
 
 # OpenStack services can be enabled or disabled with these options
diff --git a/releasenotes/notes/build-proxysql-image-ec09332ef0b7dae0.yaml b/releasenotes/notes/build-proxysql-image-ec09332ef0b7dae0.yaml
new file mode 100644
index 000000000..744a26571
--- /dev/null
+++ b/releasenotes/notes/build-proxysql-image-ec09332ef0b7dae0.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The ``proxysql`` image is now built when ``kolla_enable_proxysql`` is set
+    to ``true``.