Bump proxysql version

This patch bumps proxysql 2.4.x to 2.5.x

Change-Id: I6a67910965e38b53958fc6f8546fa6f665a47a16

7 files changed, 15 insertions, 8 deletions

diff --git a/.zuul.d/rocky.yaml b/.zuul.d/rocky.yaml
index cafe0230b..ea74b2fd9 100644
--- a/.zuul.d/rocky.yaml
+++ b/.zuul.d/rocky.yaml
@@ -28,6 +28,8 @@
             files: ^docker/(base|opensearch|fluentd|grafana|prometheus)/
         - kolla-ansible-rocky9-kvm:
             files: ^docker/nova/
+        - kolla-ansible-rocky9-cells:
+            files: ^docker/proxysql/
     check-arm64:
       jobs:
         - kolla-build-rocky9-aarch64
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index b6ea6daaa..a7cfad769 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -28,6 +28,8 @@
             files: ^docker/(base|opensearch|fluentd|grafana|prometheus)/
         - kolla-ansible-ubuntu-kvm:
             files: ^docker/nova/
+        - kolla-ansible-ubuntu-cells:
+            files: ^docker/proxysql/
     check-arm64:
       jobs:
         - kolla-build-ubuntu-aarch64
diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
index 8b6a69507..8372fef4f 100644
--- a/doc/source/contributor/versions.rst
+++ b/doc/source/contributor/versions.rst
@@ -42,7 +42,7 @@ information about package sources.
 .. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html
 .. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html
 .. _`TreasureData install guide`: https://www.fluentd.org/download
-.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/
+.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/
 
 .. _`Team RabbitMQ 'Cloudsmith' repository`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
 .. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index da40ea6c0..2c5710422 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -294,7 +294,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
    {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'},
-   {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key'},
+   {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/repo_pub_key'},
    {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
 ] %}
 
diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo
index 5b59fd777..4a20aeb3b 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/almalinux/$releasever
-gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key
+baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/almalinux/$releasever
+gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/repo_pub_key
 gpgcheck = 1
 enabled = 0
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 6d2d130ff..6f6e8c899 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -67,7 +67,7 @@ debian:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/bullseye/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -114,7 +114,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/bullseye/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -197,7 +197,7 @@ ubuntu:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/jammy/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/jammy/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -244,7 +244,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/jammy/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/jammy/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
diff --git a/releasenotes/notes/proxysql-2.5.x.yaml-6111edc2c762d5b7.yaml b/releasenotes/notes/proxysql-2.5.x.yaml-6111edc2c762d5b7.yaml
new file mode 100644
index 000000000..9120febbc
--- /dev/null
+++ b/releasenotes/notes/proxysql-2.5.x.yaml-6111edc2c762d5b7.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - ProxySQL version was increased to 2.5.x