diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-11 12:40:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-11 12:40:07 +0000 |
| commit | 865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75 (patch) | |
| tree | e0365e0316a7a358e5a52098b86588a29bee4d16 | |
| parent | c682a0fe84d28f9b5d01c6c6c90ae0338ff331f0 (diff) | |
| parent | 17799d6eb6c78c113285c7b654fec1abdd12cfd4 (diff) | |
| download | kolla-865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75.tar.gz kolla-865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75.zip | |
Merge "Support CentOS 8.3"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 8 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1907213-e0cee8498d19a170.yaml | 13 |
3 files changed, 18 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 11da4e7a6..3e632a5b6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -200,7 +200,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial 'dnf-plugins-core' ] %} {% 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 416b91cef..f6f26a804 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" @@ -36,14 +36,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 000000000..51944576a --- /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 <https://launchpad.net/bugs/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. |