From 0883532434fff341c444d8fce8e28fcff3f5e769 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 27 Sep 2022 10:18:01 +0000
Subject: Add RockyLinux 9 support

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/859570

Change-Id: I7af51d07b8a939c908aa072294061def57dd67de
---
 docker/base/Dockerfile.j2  | 19 +++++--------------
 docker/base/httpd_setup.sh |  4 ++--
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 2531b24a8..11997c583 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -69,6 +69,7 @@ Repo files not available for CentOS Stream 9:
  #}
 {% set base_yum_repo_files = [
     'grafana.repo',
+    'influxdb.repo',
     'mariadb.repo',
     'rabbitmq_rabbitmq-server.repo',
     'td.repo',
@@ -86,19 +87,16 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management
     'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
     'https://packages.treasuredata.com/GPG-KEY-td-agent',
     'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
+    'https://repos.influxdata.com/influxdb.key',
 ] %}
 
 {% if base_arch == 'x86_64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
-        'influxdb.repo',
         'rabbitmq_rabbitmq-erlang.repo',
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #   'crmsh.repo',
 
-    {% set base_yum_repo_keys = base_yum_repo_keys + [
-        'https://repos.influxdata.com/influxdb.key',
-    ] %}
 {% elif base_arch == 'aarch64' %}
 {#
 Repo files not available for CentOS Stream 9:
@@ -151,8 +149,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 
 {% block base_centos_repo_overrides_post_rpm %}{% endblock %}
 
-    {% if base_distro == 'centos' %}
-
 {% block base_centos_gpg_key_import %}
 {% endblock %}
 
@@ -187,13 +183,10 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos9-rabbitmq',
     'centos9-storage',
     'epel',
+    'influxdb',
 ] %}
 
-{% if base_arch == 'x86_64' %}
-    {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
-        'influxdb',
-    ] %}
-{% elif base_arch == 'aarch64' %}
+{% if base_arch == 'aarch64' %}
 
 {# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}
 
@@ -211,9 +204,6 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
 {% block base_centos_repo_overrides_post_yum %}{% endblock -%}
     && {{ macros.rpm_security_update(clean_package_cache) }}
 
-    {%- endif %}
-    {# Endif for base_distro centos #}
-
 #### END REPO ENABLEMENT
 
 {# We are back to the basic if conditional here which is:
@@ -224,6 +214,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
 {# NOTE(hrw): CentOS Stream 9 has curl-minimal, Rocky Linux 9 has curl so we do not install any #}
 {% set base_centos_packages = [
         'ca-certificates',
+        'crypto-policies-scripts',
         'dumb-init',
         'findutils',
         'hostname',
diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh
index fe627652b..3dbf84853 100644
--- a/docker/base/httpd_setup.sh
+++ b/docker/base/httpd_setup.sh
@@ -19,12 +19,12 @@ if [[ "$(whoami)" == 'root' ]]; then
         rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
     fi
 
-    # CentOS 8 has an issue with mod_ssl which produces an invalid Apache
+    # CentOS/Rocky have an issue with mod_ssl which produces an invalid Apache
     # configuration in /etc/httpd/conf.d/ssl.conf. This causes the following error
     # on startup:
     #   SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty
     # Work around this by generating certificates manually.
-    if [[ ${KOLLA_BASE_DISTRO} = centos ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then
+    if [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then
         /usr/libexec/httpd-ssl-gencerts
     fi
 fi
-- 
cgit v1.2.3