diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-14 11:54:45 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-07-10 10:12:35 +0000 |
| commit | eb321e4827c9cb73861168ba8dcc488a7e9a9eb1 (patch) | |
| tree | 5b0195d7bcaf8719ca94580d39e9f97d9a4357e1 | |
| parent | 7c8e5d8ec476070d422378ad557671334fa530ab (diff) | |
| download | kolla-eb321e4827c9cb73861168ba8dcc488a7e9a9eb1.tar.gz kolla-eb321e4827c9cb73861168ba8dcc488a7e9a9eb1.zip | |
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
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 715557e04..26228fa16 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 %} |