openstack
/
kolla
Code Issues Proposed changes

Switch to RDO Ussuri release on CentOS 

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

Change-Id: Ifa0614512a314a114f06ac2a39f646fddf839e80
This commit is contained in:
Mark Goddard 2020-05-29 17:17:19 +01:00 committed by Radosław Piliszek
parent 98c342da5d
commit 4d0972d497
3 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docker/base/Dockerfile.j2
View File

@ -93,7 +93,6 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
# 'crmsh.repo',
# 'opendaylight.repo',
{% set base_yum_repo_keys = [
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
@ -187,38 +186,36 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
{% 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-RDO',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
#
# '/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-ceph-nautilus',
'centos-release-openstack-ussuri',
'centos-release-opstools',
'epel-release',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
#
# 'centos-release-ceph-nautilus',
#
# FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail
COPY ceph.repo /etc/yum.repos.d/
# We need 'dnf-plugins-core' for 'dnf config-manager'
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'dnf-plugins-core'
] %}
{% set base_centos_yum_repos_to_enable = [
'PowerTools'
] %}
{% set base_centos_yum_repos_to_disable = [
'centos-ceph-nautilus',
'centos-nfs-ganesha28',
'centos-opstools',
'centos-rabbitmq-38',
'epel',
'epel-modular',
] %}
{% if base_arch == 'x86_64' %}
@ -276,7 +273,6 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
# Install base packages
{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
{{ macros.disable_extra_repos(['epel', 'epel-modular']) }}
{# endif for base_package_type rpm #}
{% elif base_package_type == 'deb' %}

13
docker/base/ceph.repo
View File

@ -1,13 +0,0 @@
[centos-ceph-nautilus]
name=Ceph packages for $basearch
baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/storage8-ceph-nautilus/$basearch/
enabled=0
gpgcheck=0
type=rpm-md
[centos-nfs-ganesha28]
name=Ganesha packages for $basearch
baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/storage8-nfsganesha-28/$basearch/
enabled=0
gpgcheck=0
type=rpm-md

2
kolla/common/config.py
View File

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