From eb321e4827c9cb73861168ba8dcc488a7e9a9eb1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 14 May 2018 11:54:45 +0100 Subject: [PATCH] centos: clean altarch repositories situation a bit CentOS team synced virt/kvm-common repository for alternate archs. We can just install 'centos-release-qemu-ev' package like it is done on x86-64. Change-Id: Ie45a0b83fc4460d5dfce82efca061272db974ead --- docker/base/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 715557e047..26228fa16a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -129,9 +129,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% endblock %} {% set base_centos_yum_repo_keys = [ + '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization' ] %} {% set base_centos_yum_repo_packages = [ + 'centos-release-qemu-ev', 'epel-release', 'yum-plugin-priorities' ] %} @@ -139,14 +141,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% if base_arch == 'x86_64' %} {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [ '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization' + '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage' ] %} {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ 'centos-release-ceph-luminous', - 'centos-release-opstools', - 'centos-release-qemu-ev' + 'centos-release-opstools' ] %} {% endif %}