openstack/kolla
Code Issues Proposed changes

Merge "proxysql: Use almalinux for centos/rocky9"

Browse Source
This commit is contained in:
Zuul 2022-10-03 14:46:31 +00:00 committed by Gerrit Code Review
commit a9b0b63fed
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

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

2
docker/base/proxysql.repo
View File

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

2
kolla/image/build.py
View File

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