Skip to content

Commit 46f8f3f

Browse files
committed
centos: switch to RDO final release of Xena
Change-Id: I547aa9dac5f003135dab8c497aea8dbac89c38e6
1 parent 9eed029 commit 46f8f3f

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

docker/base/Dockerfile.j2

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,9 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
161161
] %}
162162

163163
{% set base_centos_yum_repo_packages = [
164-
'centos-release-advanced-virtualization',
165-
'centos-release-ceph-pacific',
166164
'centos-release-nfv-extras',
167-
'centos-release-nfv-openvswitch',
165+
'centos-release-openstack-xena',
168166
'centos-release-opstools',
169-
'centos-release-rabbitmq-38',
170167
'epel-release',
171168
] %}
172169

@@ -181,9 +178,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
181178
# to go away - they are from delorean or rdo-release-wallaby package
182179
# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
183180
{% set base_centos_yum_repos_to_disable = [
184-
'advanced-virtualization',
185181
'centos-nfv-extras',
186-
'centos-nfv-ovs',
187182
'centos-advanced-virtualization',
188183
'centos-ceph-pacific',
189184
'centos-nfv-openvswitch',

kolla/common/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
help=('Set the package type of the distro. If not set then '
266266
'the packaging type is set to "rpm" if a RHEL based '
267267
'distro and "deb" if a Debian based distro.')),
268-
cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS],
268+
cfg.ListOpt('rpm_setup_config', default=[],
269269
help=('Comma separated list of .rpm or .repo file(s) '
270270
'or URL(s) to install before building containers')),
271271
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),

tests/templates/template_overrides.j2

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ RUN sed -i \
3131
{% block base_centos_repo_overrides_post_rpm %}
3232
{% endraw %}
3333

34-
RUN sed -i \
35-
-e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \
36-
/etc/yum.repos.d/delorean*.repo
37-
3834
{% raw %}
3935
{% endblock %}
4036

@@ -99,9 +95,6 @@ RUN sed -i \
9995
-e "s|^#\(mirrorlist.*\)|\1|" \
10096
-e "s|^baseurl=http://{{ nodepool_mirror_host }}|#baseurl=http://mirror.centos.org|" \
10197
/etc/yum.repos.d/CentOS-*.repo \
102-
&& sed -i \
103-
-e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \
104-
/etc/yum.repos.d/delorean*.repo \
10598
&& sed -i \
10699
-e "s|^#\(metalink.*\)|\1|" \
107100
-e "s|^baseurl=http://{{ nodepool_mirror_host }}|#baseurl=http://download.example/pub|" \

0 commit comments

Comments
 (0)