Revert "Move to RDO Train packages"

This reverts commit c78c82c9630b334cbaef040d68bce7e5ae8cc118.

Change-Id: I61c68bf738673a96dd5ba256e40e8532364ff281

4 files changed, 6 insertions, 4 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 9858f7c0d..170885346 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -164,14 +164,12 @@ 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',
     '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
 ] %}
 
 {% set base_centos_yum_repo_packages = [
-    'centos-release-openstack-train',
     'centos-release-ceph-nautilus',
     'centos-release-opstools',
     'centos-release-qemu-ev',
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index a35b4b297..a3cc0747b 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -61,7 +61,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       'collectd-procevent',
       'collectd-snmp-agent',
       'collectd-sysevent',
-      'python2-collectd-gnocchi',
+      'python-collectd-gnocchi',
       'python2-collectd-rabbitmq-monitoring',
       'python2-sqlalchemy-collectd'
   ] %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 85e9ca69d..67401d587 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -285,7 +285,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=[],
+    cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
                 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')),
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 761bf0e83..3dc7035ca 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -43,6 +43,10 @@ RUN sed -i \
 {% block base_centos_repo_overrides_post_rpm %}
 {% endraw %}
 
+RUN sed -i \
+        -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
+        /etc/yum.repos.d/delorean*.repo
+
 {% raw %}
 {% endblock %}