Skip to content

Commit b439904

Browse files
abradenyoctozepto
andcommitted
Support CentOS 8.3
Backport this until Train. CentOS 8.3 renamed system repos. [1] This caused failures when disabling and enabling. More details in the referenced bug report. Notice CentOS 8.2 and below will no longer work. [1] https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes Change-Id: I2d67b3ed7b7c521bc755ec9a87365c9962a9eeff Closes-Bug: #1907213 Co-Authored-By: Radosław Piliszek <[email protected]> Depends-On: https://review.opendev.org/766182
1 parent e54f95e commit b439904

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
@@ -202,7 +202,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
202202
] %}
203203

204204
{% set base_centos_yum_repos_to_enable = [
205-
'PowerTools'
205+
'powertools',
206206
] %}
207207

208208
{% 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"
@@ -35,14 +35,14 @@ centos-ppc64le:
3535
epel: "epel"
3636
epel-modular: "epel-modular"
3737
extras: "extras"
38-
hacluster: "HighAvailability"
38+
hacluster: "ha"
3939
logstash: "elasticsearch-kibana-logstash-6.x"
4040
opstools: "centos-opstools"
4141
rabbitmq: "rabbitmq_rabbitmq-server"
4242

4343
rhel:
4444
erlang: "centos-rabbitmq-38"
45-
hacluster: "HighAvailability"
45+
hacluster: "ha"
4646
opstools: "centos-opstools"
4747
rabbitmq: "centos-rabbitmq-38"
4848

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)