Browse Source

Merge "centos: switch to RDO final release of Wallaby" into stable/wallaby

changes/03/788603/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
2397aedcbc
3 changed files with 2 additions and 21 deletions
  1. +1
    -13
      docker/base/Dockerfile.j2
  2. +1
    -1
      kolla/common/config.py
  3. +0
    -7
      tests/templates/template_overrides.j2

+ 1
- 13
docker/base/Dockerfile.j2 View File

@ -195,11 +195,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
#
{% set base_centos_yum_repo_packages = [
'centos-release-advanced-virtualization',
'centos-release-ceph-nautilus',
'centos-release-nfv-openvswitch',
'centos-release-openstack-wallaby',
'centos-release-opstools',
'centos-release-rabbitmq-38',
'epel-release',
] %}
@ -210,12 +207,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
{% set base_centos_yum_repos_to_enable = [
] %}
# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') need
# to go away - they are from delorean or rdo-release-wallaby package
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
{% set base_centos_yum_repos_to_disable = [
'advanced-virtualization',
'centos-nfv-ovs',
'centos-advanced-virtualization',
'centos-ceph-nautilus',
'centos-nfv-openvswitch',
@ -227,10 +219,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
'influxdb',
] %}
{% elif base_arch == 'aarch64' %}
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
'centos-release-rabbitmq-38'
] %}
{% endif %}
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}


+ 1
- 1
kolla/common/config.py View File

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


+ 0
- 7
tests/templates/template_overrides.j2 View File

@ -40,10 +40,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 %}
@ -108,9 +104,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.fedoraproject.org/pub|" \


Loading…
Cancel
Save