Skip to content

Commit 542a22f

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Support CentOS 8.3" into stable/victoria
2 parents a055d35 + 58d6bc5 commit 542a22f

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

docker/base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
201201
'dnf-plugins-core'
202202
] %}
203203
{% set base_centos_yum_repos_to_enable = [
204-
'PowerTools',
204+
'powertools',
205205
] %}
206206

207207
{% set base_centos_yum_repos_to_disable = [

kolla/template/repos.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ centos:
88
erlang: "rabbitmq_rabbitmq-erlang"
99
extras: "extras"
1010
grafana: "grafana"
11-
hacluster: "HighAvailability"
11+
hacluster: "ha"
1212
influxdb: "influxdb"
1313
logstash: "elasticsearch-kibana-logstash-6.x"
1414
kibana: "elasticsearch-kibana-logstash-6.x"
@@ -24,7 +24,7 @@ centos-aarch64:
2424
erlang: "centos-rabbitmq-38"
2525
extras: "extras"
2626
grafana: "grafana"
27-
hacluster: "HighAvailability"
27+
hacluster: "ha"
2828
logstash: "elasticsearch-kibana-logstash-6.x"
2929
opstools: "centos-opstools"
3030
rabbitmq: "rabbitmq_rabbitmq-server"
@@ -36,14 +36,14 @@ centos-ppc64le:
3636
epel: "epel"
3737
epel-modular: "epel-modular"
3838
extras: "extras"
39-
hacluster: "HighAvailability"
39+
hacluster: "ha"
4040
logstash: "elasticsearch-kibana-logstash-6.x"
4141
opstools: "centos-opstools"
4242
rabbitmq: "rabbitmq_rabbitmq-server"
4343

4444
rhel:
4545
erlang: "centos-rabbitmq-38"
46-
hacluster: "HighAvailability"
46+
hacluster: "ha"
4747
opstools: "centos-opstools"
4848
rabbitmq: "centos-rabbitmq-38"
4949

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes builds on CentOS 8.3 failing due to renamed repos.
5+
Notice Kolla now no longer supports CentOS 8.2 and below.
6+
`LP#1907213 <https://launchpad.net/bugs/1907213>`__
7+
upgrade:
8+
- |
9+
Kolla now no longer supports CentOS 8.2 and below.
10+
This is to support CentOS 8.3 without extra workarounds (please
11+
see the fixes section for more details).
12+
The promise is to support the latest CentOS 8 release which is 8.3
13+
now.

0 commit comments

Comments
 (0)