Skip to content

Commit f99c379

Browse files
committed
Switch to centos-release-openstack-victoria package
Change-Id: I3230c352ee057079ae3697f2b9f6a9768e4bac2b
1 parent b76da23 commit f99c379

File tree

2 files changed

+1
-140
lines changed

2 files changed

+1
-140
lines changed

docker/base/Dockerfile.j2

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
190190
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
191191
#
192192

193-
# FIXME(mnasiadka): Remove adv virt, ceph, nfv-ovs and rabbitmq-38 repos
194-
# once centos-release-openstack-victoria package is out
195193
{% set base_centos_yum_repo_packages = [
196-
'centos-release-advanced-virtualization',
197-
'centos-release-ceph-nautilus',
198-
'centos-release-nfv-openvswitch',
199-
'centos-release-rabbitmq-38',
194+
'centos-release-openstack-victoria',
200195
'centos-release-opstools',
201196
'epel-release',
202197
] %}
@@ -219,15 +214,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
219214
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
220215
'influxdb',
221216
] %}
222-
{% elif base_arch == 'aarch64' %}
223-
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
224-
'centos-release-rabbitmq-38'
225-
] %}
226217
{% endif %}
227218

228-
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 \
229-
-o /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
230-
ADD rdo.repo /etc/yum.repos.d/CentOS-OpenStack-Victoria.repo
231219
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
232220

233221
{%- 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

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)