openstack/kolla
Code Issues Proposed changes

Bump proxysql version

Browse Source 
This patch bumps proxysql 2.4.x to 2.5.x

Change-Id: I6a67910965e38b53958fc6f8546fa6f665a47a16
This commit is contained in:
Michal Arbet 2023-06-14 15:01:50 +02:00 committed by Maksim Malchuk
parent 11f90f3746
commit 60603d240c
7 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.d/rocky.yaml
View File

@ -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

2
.zuul.d/ubuntu.yaml
View File

@ -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

2
doc/source/contributor/versions.rst
View File

@ -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

2
docker/base/Dockerfile.j2
View File

@ -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'},
] %}

4
docker/base/proxysql.repo
View File

@ -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

8
kolla/template/repos.yaml
View File

@ -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"

3
releasenotes/notes/proxysql-2.5.x.yaml-6111edc2c762d5b7.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- ProxySQL version was increased to 2.5.x