Skip to content

Commit 068790c

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Bump proxysql to 2.7.x"
2 parents 5f07585 + 046ad52 commit 068790c

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

doc/source/contributor/versions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ information about package sources.
2222
MariaDB 10.11 (LTS) `MariaDB Community downloads`_
2323
Galera 26.4 (LTS) `MariaDB Community downloads`_
2424
OpenSearch 2.x `OpenSearch install guide`_
25-
ProxySQL 2.6.x `ProxySQL repository`_
25+
ProxySQL 2.7.x `ProxySQL repository`_
2626
Rabbitmq 3.13.x - CentOS/Rocky:
2727
`Team RabbitMQ 'Cloudsmith' repo (RPM)`_
2828
- Debian/Ubuntu:
@@ -42,7 +42,7 @@ information about package sources.
4242
.. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html
4343
.. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html
4444
.. _`TreasureData install guide`: https://www.fluentd.org/download
45-
.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/
45+
.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/
4646

4747
.. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
4848
.. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang

docker/base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
306306
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
307307
{'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
308308
{'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'},
309-
{'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/repo_pub_key'},
309+
{'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/repo_pub_key'},
310310
{'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
311311
] %}
312312

docker/base/proxysql.repo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[proxysql]
22
name = ProxySQL
3-
baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/almalinux/$releasever
4-
gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/repo_pub_key
3+
baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/almalinux/$releasever
4+
gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/repo_pub_key
55
gpgcheck = 1
66
enabled = 0

kolla/template/repos.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ debian:
7575
component: "main"
7676
gpg_key: "opensearch.asc"
7777
proxysql:
78-
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/"
78+
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/bookworm/"
7979
suite: "./"
8080
component: ""
8181
gpg_key: "proxysql.asc"
@@ -122,7 +122,7 @@ debian-aarch64:
122122
component: "main"
123123
gpg_key: "opensearch.asc"
124124
proxysql:
125-
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/"
125+
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/bookworm/"
126126
suite: "./"
127127
component: ""
128128
gpg_key: "proxysql.asc"
@@ -209,7 +209,7 @@ ubuntu:
209209
component: "main"
210210
gpg_key: "opensearch.asc"
211211
proxysql:
212-
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/noble/"
212+
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/noble/"
213213
suite: "./"
214214
component: ""
215215
gpg_key: "proxysql.asc"
@@ -257,7 +257,7 @@ ubuntu-aarch64:
257257
component: "main"
258258
gpg_key: "opensearch.asc"
259259
proxysql:
260-
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/noble/"
260+
url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/noble/"
261261
suite: "./"
262262
component: ""
263263
gpg_key: "proxysql.asc"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
upgrade:
3+
- Upgraded ProxySQL to version ``2.7.x``.

0 commit comments

Comments
 (0)