Merge "Use Victoria RDO" into stable/victoria

docker/base/Dockerfile.j2

@@ -183,15 +183,21 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 {% set base_centos_yum_repo_keys = [
     '/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-Cloud',
 ] %}
 # FIXME(mgoddard): Not available for CentOS 8 yet.
 #
 #   '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
 #
 
+# FIXME(mnasiadka): Remove adv virt, ceph, nfv-ovs and rabbitmq-38 repos
+#                   once centos-release-openstack-victoria package is out
 {% set base_centos_yum_repo_packages = [
-    'centos-release-opstools',
+    'centos-release-advanced-virtualization',
     'centos-release-ceph-nautilus',
+    'centos-release-nfv-openvswitch',
+    'centos-release-rabbitmq-38',
+    'centos-release-opstools',
     'epel-release',
 ] %}
 
@@ -219,6 +225,9 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     ] %}
 {% endif %}
 
+RUN curl -sSLf https://git.centos.org/rpms/centos-release-openstack/raw/c8-sig-cloud-openstack-victoria/f/SOURCES/RPM-GPG-KEY-CentOS-SIG-Cloud \
+    -o /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+ADD rdo.repo /etc/yum.repos.d/CentOS-OpenStack-Victoria.repo
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
 
 {%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}

docker/base/rdo.repo

@@ -0,0 +1,127 @@
+# CentOS-OpenStack-Victoria.repo
+#
+# Please see http://wiki.centos.org/SpecialInterestGroup/Cloud for more
+# information
+[centos-openstack-victoria]
+name=CentOS-$releasever - OpenStack Victoria
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/cloud/$basearch/openstack-victoria/
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cloud-openstack-victoria
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+exclude=sip,PyQt4
+module_hotfixes=1
+[centos-openstack-victoria-test]
+name=CentOS-$releasever - OpenStack Victoria Testing
+baseurl=https://buildlogs.centos.org/centos/$releasever/cloud/$basearch/openstack-victoria/
+gpgcheck=0
+enabled=0
+exclude=sip,PyQt4
+module_hotfixes=1
+[centos-openstack-victoria-debuginfo]
+name=CentOS-$releasever - OpenStack Victoria - Debug
+baseurl=http://debuginfo.centos.org/centos/$releasever/cloud/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+exclude=sip,PyQt4
+module_hotfixes=1
+[centos-openstack-victoria-source]
+name=CentOS-$releasever - OpenStack Victoria - Source
+baseurl=http://vault.centos.org/centos/$releasever/cloud/Source/openstack-victoria/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+exclude=sip,PyQt4
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-baremetal]
+name=rdo-trunk-victoria-tested-component-baremetal
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/baremetal/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-cinder]
+name=rdo-trunk-victoria-tested-component-cinder
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/cinder/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-clients]
+name=rdo-trunk-victoria-tested-component-clients
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/clients/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-cloudops]
+name=rdo-trunk-victoria-tested-component-cloudops
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/cloudops/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-common]
+name=rdo-trunk-victoria-tested-component-common
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/common/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-compute]
+name=rdo-trunk-victoria-tested-component-compute
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/compute/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-glance]
+name=rdo-trunk-victoria-tested-component-glance
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/glance/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-manila]
+name=rdo-trunk-victoria-tested-component-manila
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/manila/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-network]
+name=rdo-trunk-victoria-tested-component-network
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/network/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-octavia]
+name=rdo-trunk-victoria-tested-component-octavia
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/octavia/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-security]
+name=rdo-trunk-victoria-tested-component-security
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/security/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-swift]
+name=rdo-trunk-victoria-tested-component-swift
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/swift/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-tempest]
+name=rdo-trunk-victoria-tested-component-tempest
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/tempest/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-tripleo]
+name=rdo-trunk-victoria-tested-component-tripleo
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/tripleo/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+[rdo-trunk-victoria-tested-component-ui]
+name=rdo-trunk-victoria-tested-component-ui
+baseurl=https://trunk.rdoproject.org/centos8-victoria/component/ui/current-tripleo-rdo
+enabled=0
+gpgcheck=0
+module_hotfixes=1
+

kolla/common/config.py

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

tests/templates/template_overrides.j2

@@ -39,10 +39,6 @@ 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 %}