[release] centos: switch to CentOS cloud SIG packages

Change-Id: Iecc4fa7e3204a4df7fd41e46e55b2895c43ddc43

Author: markgoddard

docker/base/Dockerfile.j2

@@ -153,9 +153,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 ] %}
 
 {% set base_centos_yum_repo_packages = [
-    'centos-release-ceph-pacific',
     'centos-release-nfv-extras',
-    'centos-release-nfv-openvswitch',
+    'centos-release-openstack-yoga',
     'centos-release-opstools',
     'epel-release',
 ] %}
@@ -171,12 +170,12 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 # from delorean or rdo-release-* package
 # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
 {% set base_centos_yum_repos_to_disable = [
-    'advanced-virtualization',
-    'centos-nfv-extras',
-    'centos-nfv-ovs',
+    'centos-advanced-virtualization',
     'centos-ceph-pacific',
+    'centos-nfv-extras',
     'centos-nfv-openvswitch',
     'centos-opstools',
+    'centos-rabbitmq-38',
     'epel',
     'epel-modular',
 ] %}

kolla/common/config.py

@@ -266,7 +266,7 @@
                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')),

tests/templates/template_overrides.j2

@@ -29,13 +29,6 @@ RUN sed -i \
 {% endblock %}
 
 {% 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 %}
 
 {% block base_centos_repo_overrides_post_yum -%}
@@ -99,9 +92,6 @@ RUN sed -i \
         -e "s|^#\(mirrorlist.*\)|\1|" \
         -e "s|^baseurl=http://{{ nodepool_mirror_host }}|#baseurl=http://mirror.centos.org|" \
         /etc/yum.repos.d/CentOS-*.repo \
-    && sed -i \
-        -e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \
-        /etc/yum.repos.d/delorean*.repo \
     && sed -i \
         -e "s|^#\(metalink.*\)|\1|" \
         -e "s|^baseurl=http://{{ nodepool_mirror_host }}|#baseurl=http://download.example/pub|" \