diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 69c0d53fbc..e604bb0de2 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -202,7 +202,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial ] %} {% set base_centos_yum_repos_to_enable = [ - 'PowerTools' + 'powertools', ] %} {% set base_centos_yum_repos_to_disable = [ diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index b1b15bc290..0cd886e5eb 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -8,7 +8,7 @@ centos: erlang: "rabbitmq_rabbitmq-erlang" extras: "extras" grafana: "grafana" - hacluster: "HighAvailability" + hacluster: "ha" influxdb: "influxdb" logstash: "elasticsearch-kibana-logstash-6.x" kibana: "elasticsearch-kibana-logstash-6.x" @@ -24,7 +24,7 @@ centos-aarch64: erlang: "centos-rabbitmq-38" extras: "extras" grafana: "grafana" - hacluster: "HighAvailability" + hacluster: "ha" logstash: "elasticsearch-kibana-logstash-6.x" opstools: "centos-opstools" rabbitmq: "rabbitmq_rabbitmq-server" @@ -35,14 +35,14 @@ centos-ppc64le: epel: "epel" epel-modular: "epel-modular" extras: "extras" - hacluster: "HighAvailability" + hacluster: "ha" logstash: "elasticsearch-kibana-logstash-6.x" opstools: "centos-opstools" rabbitmq: "rabbitmq_rabbitmq-server" rhel: erlang: "centos-rabbitmq-38" - hacluster: "HighAvailability" + hacluster: "ha" opstools: "centos-opstools" rabbitmq: "centos-rabbitmq-38" diff --git a/releasenotes/notes/bug-1907213-e0cee8498d19a170.yaml b/releasenotes/notes/bug-1907213-e0cee8498d19a170.yaml new file mode 100644 index 0000000000..51944576a4 --- /dev/null +++ b/releasenotes/notes/bug-1907213-e0cee8498d19a170.yaml @@ -0,0 +1,13 @@ +--- +fixes: + - | + Fixes builds on CentOS 8.3 failing due to renamed repos. + Notice Kolla now no longer supports CentOS 8.2 and below. + `LP#1907213 `__ +upgrade: + - | + Kolla now no longer supports CentOS 8.2 and below. + This is to support CentOS 8.3 without extra workarounds (please + see the fixes section for more details). + The promise is to support the latest CentOS 8 release which is 8.3 + now.