openstack
/
kolla
Code Issues Proposed changes

Merge "Bump proxysql to 2.6.x"

This commit is contained in:
Zuul 2024-03-26 13:11:27 +00:00 committed by Gerrit Code Review
parent 8f236dc8f4 2bfdf4e7c9
commit 2576fbde00
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ information about package sources.
MariaDB 10.11 (LTS) `MariaDB Community downloads`_
Galera 26.4 (LTS) `MariaDB Community downloads`_
OpenSearch 2.x `OpenSearch install guide`_
ProxySQL 2.4.x `ProxySQL repository`_
ProxySQL 2.6.x `ProxySQL repository`_
Rabbitmq 3.10.x - CentOS:
`Team RabbitMQ 'PackageCloud' repository`_
- Debian/Ubuntu:
@ -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.5.x/
.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.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

@ -306,7 +306,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.5.x/repo_pub_key'},
{'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.6.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.5.x/almalinux/$releasever
gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/repo_pub_key
baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/almalinux/$releasever
gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/repo_pub_key
gpgcheck = 1
enabled = 0

8
kolla/template/repos.yaml
View File

@ -75,7 +75,7 @@ debian:
component: "main"
gpg_key: "opensearch.asc"
proxysql:
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/"
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/"
suite: "./"
component: ""
gpg_key: "proxysql.asc"
@ -122,7 +122,7 @@ debian-aarch64:
component: "main"
gpg_key: "opensearch.asc"
proxysql:
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/"
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/"
suite: "./"
component: ""
gpg_key: "proxysql.asc"
@ -208,7 +208,7 @@ ubuntu:
component: "main"
gpg_key: "opensearch.asc"
proxysql:
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/jammy/"
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/jammy/"
suite: "./"
component: ""
gpg_key: "proxysql.asc"
@ -255,7 +255,7 @@ ubuntu-aarch64:
component: "main"
gpg_key: "opensearch.asc"
proxysql:
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/jammy/"
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/jammy/"
suite: "./"
component: ""
gpg_key: "proxysql.asc"

3
releasenotes/notes/bump-proxysql-version-9e646a32db57a451.yaml Normal file
View File

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