@@ -190,13 +190,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
190
190
# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
191
191
#
192
192
193
- # FIXME(mnasiadka): Remove adv virt, ceph, nfv-ovs and rabbitmq-38 repos
194
- # once centos-release-openstack-victoria package is out
195
193
{% 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' ,
200
195
'centos-release-opstools' ,
201
196
'epel-release' ,
202
197
] %}
@@ -219,15 +214,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
219
214
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
220
215
'influxdb' ,
221
216
] %}
222
- {% elif base_arch == 'aarch64' %}
223
- {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
224
- 'centos-release-rabbitmq-38'
225
- ] %}
226
217
{% endif %}
227
218
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
231
219
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
232
220
233
221
{% - for repo in base_centos_yum_repos_to_enable | customizable ('centos_yum_repos_to_enable' ) %} && dnf config-manager --enable {{ repo }} {% endfor -%}
0 commit comments