From f0849eca8df604c03ea8f589f5a331aff43c2ae7 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 3 Oct 2022 12:52:37 +0200
Subject: [PATCH] proxysql: Use almalinux for centos/rocky9

As per https://github.com/sysown/proxysql/issues/3989

Change-Id: If077d60e9efd29fab80f4f5188a4f54015734a92
---
 docker/base/Dockerfile.j2 | 2 +-
 docker/base/proxysql.repo | 2 +-
 kolla/image/build.py      | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 11997c5830..d54a4680e7 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -65,12 +65,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {#
 Repo files not available for CentOS Stream 9:
     'elasticsearch.repo',  # signed with SHA1 key https://github.com/elastic/elasticsearch/issues/85876
-    'proxysql.repo',       # no repository yet for RHEL9 family
  #}
 {% set base_yum_repo_files = [
     'grafana.repo',
     'influxdb.repo',
     'mariadb.repo',
+    'proxysql.repo',
     'rabbitmq_rabbitmq-server.repo',
     'td.repo',
 ] %}
diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo
index 5276bbf678..5b59fd777e 100644
--- a/docker/base/proxysql.repo
+++ b/docker/base/proxysql.repo
@@ -1,6 +1,6 @@
 [proxysql]
 name = ProxySQL
-baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/centos/$releasever
+baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/almalinux/$releasever
 gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key
 gpgcheck = 1
 enabled = 0
diff --git a/kolla/image/build.py b/kolla/image/build.py
index b03e4a9d8f..0228b76a78 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -97,7 +97,6 @@ UNBUILDABLE_IMAGES = {
         "logstash",              # SHA1 gpg key
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "proxysql",              # no binary package
         "tgtd",                  # Not supported on CentOS
     },
 
@@ -111,7 +110,6 @@ UNBUILDABLE_IMAGES = {
         "logstash",              # SHA1 gpg key
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "proxysql",              # no binary package
         "tgtd",                  # Not supported on CentOS
     },