From c5d2e9683d8c26e382356a1c1b6d431e78e0f398 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 10 Apr 2019 17:27:15 +0100
Subject: [PATCH] Switch to RDO Stein release on CentOS & Oracle

This change switches from the Delorean yum repositories to the RDO Stein
release repository.

centos-release-openstack-stein pulls in centos-release-ceph-nautilus,
which conflicts with upstream ceph packages. Disable the CentOS Ceph
repo to work around this.

Change-Id: I1df5dd28adc65ff461a893b60c57d7b5da96d653
---
 docker/base/Dockerfile.j2    | 18 ++++++++++++------
 docker/tempest/Dockerfile.j2 |  2 +-
 kolla/common/config.py       |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c2fb01d71a..7463a8e2d4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -141,24 +141,28 @@ 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-Virtualization'
 ] %}
 
 {% set base_centos_yum_repo_packages = [
+    'centos-release-openstack-stein',
     'centos-release-opstools',
     'centos-release-qemu-ev',
     'epel-release',
     'yum-plugin-priorities'
 ] %}
 
-{{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages")) }}
-{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %}
-    {%- if loop.first %}RUN {% else %}    && {% endif -%}
-    rpm --import {{ key }} \
+# centos-release-openstack-stein pulls in centos-release-ceph-nautilus,
+# which conflicts with upstream ceph packages. Disable the CentOS Ceph repo to
+# work around this.
+RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \
+    && yum-config-manager --disable centos-ceph-nautilus \
+{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%}
+    && rpm --import {{ key }} \
 {% endfor -%}
-{%- if base_centos_yum_repo_keys|customizable('centos_yum_repo_keys')|length == 0 %}RUN {% else %}    && {% endif -%}
-    {{ macros.rpm_security_update(clean_package_cache) }}
+    && {{ macros.rpm_security_update(clean_package_cache) }}
     {%- endif %}
     {# Endif for base_distro centos #}
 
@@ -189,12 +193,14 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
 COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
 RUN {{ macros.install_packages( ['tar', 'yum-utils', 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' ], chain=True, clean=False) }} \
     && rpm -Uvh --nodeps \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-openstack-stein-1-1.el7.centos.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-8.el7.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-3.el7.centos.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-storage-common-2-2.el7.centos.noarch.rpm \
     && sed -i 's/\$releasever/7/g' /etc/yum.repos.d/CentOS-*.repo \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
+    && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization \
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2
index ec0edf161d..ee8d938d51 100644
--- a/docker/tempest/Dockerfile.j2
+++ b/docker/tempest/Dockerfile.j2
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
-        {% set tempest_packages = ['openstack-tempest-all'] %}
+        {% set tempest_packages = ['openstack-tempest'] %}
 
     {% elif base_package_type == 'deb' %}
         {% set tempest_packages = ['tempest'] %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 674bc3d243..13f8508909 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -278,7 +278,7 @@ _BASE_OPTS = [
                help=('Set the package type of the distro. If not set then '
                      'the packaging type is set to "rpm" if a RHEL based '
                      'distro and "deb" if a Debian based distro.')),
-    cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
+    cfg.ListOpt('rpm_setup_config', default=[],
                 help=('Comma separated list of .rpm or .repo file(s) '
                       'or URL(s) to install before building containers')),
     cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),