From 17799d6eb6c78c113285c7b654fec1abdd12cfd4 Mon Sep 17 00:00:00 2001
From: abraden <C-Albert.Braden@charter.com>
Date: Mon, 7 Dec 2020 19:20:44 +0000
Subject: [PATCH] Support CentOS 8.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <radoslaw.piliszek@gmail.com>
Depends-On: https://review.opendev.org/766211
---
 docker/base/Dockerfile.j2                           |  2 +-
 kolla/template/repos.yaml                           |  8 ++++----
 .../notes/bug-1907213-e0cee8498d19a170.yaml         | 13 +++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/bug-1907213-e0cee8498d19a170.yaml

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 11da4e7a6d..3e632a5b6a 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 416b91cefa..f6f26a8046 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 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 <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.