Merge "centos: clean altarch repositories situation a bit"

This commit is contained in:
Zuul 2018-08-07 13:17:05 +00:00 committed by Gerrit Code Review
commit cd1f1f1ff3
1 changed files with 4 additions and 4 deletions

View File

@ -128,9 +128,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,14 +140,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 %}