centos: switch to RDO final release of Xena
Change-Id: I547aa9dac5f003135dab8c497aea8dbac89c38e6
This commit is contained in:
parent
9eed029a83
commit
46f8f3f63d
|
@ -161,12 +161,9 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
|
|||
] %}
|
||||
|
||||
{% set base_centos_yum_repo_packages = [
|
||||
'centos-release-advanced-virtualization',
|
||||
'centos-release-ceph-pacific',
|
||||
'centos-release-nfv-extras',
|
||||
'centos-release-nfv-openvswitch',
|
||||
'centos-release-openstack-xena',
|
||||
'centos-release-opstools',
|
||||
'centos-release-rabbitmq-38',
|
||||
'epel-release',
|
||||
] %}
|
||||
|
||||
|
@ -181,9 +178,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
|
|||
# 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-extras',
|
||||
'centos-nfv-ovs',
|
||||
'centos-advanced-virtualization',
|
||||
'centos-ceph-pacific',
|
||||
'centos-nfv-openvswitch',
|
||||
|
|
|
@ -265,7 +265,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')),
|
||||
|
|
|
@ -31,10 +31,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 %}
|
||||
|
||||
|
@ -99,9 +95,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|" \
|
||||
|
|
Loading…
Reference in New Issue