From 61992193edf2864f051ad8e7f9f3517187c50245 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Mon, 9 Jun 2025 11:39:03 +0100
Subject: [PATCH 1/2] Bump proxysql to be compatible with K-A bug #2112339 fix

---
 etc/kayobe/kolla-image-tags.yml                             | 3 +++
 .../bump-proxysql-to-fix-bug-2112339-4ff996a807e78204.yaml  | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/bump-proxysql-to-fix-bug-2112339-4ff996a807e78204.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 3f3b4c606..9212fa60b 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -15,6 +15,9 @@ kolla_image_tags:
     rocky-9: master-rocky-9-20250305T111730
   prometheus:
     rocky-9: master-rocky-9-20250430T112026
+  proxysql:
+    rocky-9: master-rocky-9-20250609T102146
+    ubuntu-noble: master-ubuntu-noble-20250609T102146
   rabbitmq:
     rocky-9: master-rocky-9-20250502T080944
   skyline:
diff --git a/releasenotes/notes/bump-proxysql-to-fix-bug-2112339-4ff996a807e78204.yaml b/releasenotes/notes/bump-proxysql-to-fix-bug-2112339-4ff996a807e78204.yaml
new file mode 100644
index 000000000..fb72dd691
--- /dev/null
+++ b/releasenotes/notes/bump-proxysql-to-fix-bug-2112339-4ff996a807e78204.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Bumped ProxySQL Kolla image to be compatible with Kolla-Ansible bug
+    fix: `Missing default hostgroup for user in proxysql Edit
+    <https://bugs.launchpad.net/kolla-ansible/+bug/2112339>`__

From 25ddeb5221f77a3833e6b605a1c07b95a5c4e5b9 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Mon, 9 Jun 2025 12:27:46 +0100
Subject: [PATCH 2/2] Fix kolla-images.py for latest master Kolla Ansible

Kolla-ansible change [1] introduced ``docker_image_url`` variable and
it replaced the prefix for all kolla images.
Changed replacement in kolla-images.py accordingly to fix ``image_map``
not being able to be constructed well as before.

[1] https://review.opendev.org/c/openstack/kolla-ansible/+/951747
---
 tools/kolla-images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/kolla-images.py b/tools/kolla-images.py
index e8ee420d1..7366ec971 100755
--- a/tools/kolla-images.py
+++ b/tools/kolla-images.py
@@ -311,7 +311,7 @@ def check_image_map(kolla_ansible_path: str):
     image_map = yaml.safe_load(image_map_str)
     image_var_re = re.compile(r"^([a-z0-9_]+)_image$")
     image_map = {
-        image_var_re.match(image_var).group(1): image.split("/")[-1].replace('{{ docker_image_name_prefix }}', '')
+        image_var_re.match(image_var).group(1): image.split("/")[-1].replace('{{ docker_image_url }}', '')
         for image_var, image in image_map.items()
     }
     # Filter out unsupported images.