Build CentOS Stream 8 images

This is part of the effort to allow a migration path
for operators using CentOS 7 and Train today.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/831265
Change-Id: I75373eb21c4269c20f72603ad4cf162a472de25b
(cherry picked from commit 67d6d28b6208cc004a50f19be1386d88c2404bc4)

3 files changed, 30 insertions, 7 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a683edcd7..e96005a2d 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -93,6 +93,7 @@ COPY yum.conf /etc/yum.conf
     # see https://launchpad.net/bugs/1884034
     {% if distro_package_manager == 'dnf' %}
         {% set base_yum_repo_files = base_yum_repo_files + [
+            'delorean-deps.repo',
             'rabbitmq_rabbitmq-erlang.repo',
         ] %}
     {% endif %}
@@ -225,24 +226,20 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 {% endblock %}
 
 {% set base_centos_yum_repo_keys = [
-    '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
     '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
     '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
 ] %}
 
 {% set base_centos_yum_repo_packages = [
-    'centos-release-nfs-ganesha28',
-    'centos-release-openstack-train',
+    'centos-release-ceph-nautilus',
     'centos-release-opstools',
     'epel-release',
 ] %}
-
 {% set base_centos_yum_repos_to_disable = [
 ] %}
 
 {% if distro_package_manager == 'dnf' %}
     {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
-        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization-RDO',
     ] %}
     # We need 'dnf-plugins-core' for 'dnf config-manager'
     {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
@@ -261,10 +258,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
     ] %}
 {% else %}
     {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
+        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
         '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
     ] %}
     {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
-        'centos-release-ceph-nautilus',
+        'centos-release-nfs-ganesha28',
+        'centos-release-openstack-train',
         'centos-release-qemu-ev',
         'yum-plugin-priorities',
     ] %}
@@ -331,6 +330,7 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
 {% set base_centos_binary_packages = [
         'ca-certificates',
         'findutils',
+        'hostname',
         'iproute',
         'iscsi-initiator-utils',
         'lvm2',
@@ -371,6 +371,7 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
 {% set base_centos_source_packages = [
     'ca-certificates',
     'curl',
+    'hostname',
     'iproute',
     'iscsi-initiator-utils',
     'lvm2',
diff --git a/docker/base/delorean-deps.repo b/docker/base/delorean-deps.repo
new file mode 100644
index 000000000..ffc53dd10
--- /dev/null
+++ b/docker/base/delorean-deps.repo
@@ -0,0 +1,23 @@
+# Adapted from https://trunk.rdoproject.org/centos8-train/delorean-deps.repo
+
+[delorean-train-testing]
+name=dlrn-train-testing
+baseurl=https://trunk.rdoproject.org/centos8-train/deps/latest/
+enabled=1
+gpgcheck=0
+module_hotfixes=1
+
+[delorean-train-build-deps]
+name=dlrn-train-build-deps
+baseurl=https://trunk.rdoproject.org/centos8-train/build-deps/latest/
+enabled=1
+gpgcheck=0
+module_hotfixes=1
+
+[centos-rabbitmq-38]
+name=Messaging RabbitMQ
+baseurl=http://mirror.centos.org/centos/8-stream/messaging/$basearch/rabbitmq-38
+gpgcheck=0
+enabled=1
+module_hotfixes=1
+skip_if_unavailable=1
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index a06432475..78f88bbf4 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -15,7 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if distro_python_version.startswith('3') %}
     {% set cinder_volume_packages = cinder_volume_packages + [
             'python3-rtslib',
-            'python3-cinderlib',
     ] %}
     {% else %}
     {# NOTE(hrw): qpid-proton-c 0.26 from centos-openstack-train repo instead of epel #}