openstack
/
kolla
Code Issues Proposed changes

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
(cherry-pick from eb321e4827)
This commit is contained in:
Marcin Juszkiewicz 2018-05-14 11:54:45 +01:00 committed by Pedro Alvarez
parent eee4781c0c
commit f61e7bf102
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/base/Dockerfile.j2
View File

@ -127,9 +127,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'
] %}
@ -138,15 +140,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
{% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
'/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-openstack-queens',
'centos-release-opstools',
'centos-release-qemu-ev'
'centos-release-opstools'
] %}
{% elif base_arch == 'ppc64le' %}
{% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [