Browse Source

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
Marcin Juszkiewicz 1 year ago
parent
commit
eb321e4827
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      docker/base/Dockerfile.j2

+ 4
- 4
docker/base/Dockerfile.j2 View File

@@ -129,9 +129,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
129 129
 {% endblock %}
130 130
 
131 131
 {% set base_centos_yum_repo_keys = [
132
+    '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
132 133
 ] %}
133 134
 
134 135
 {% set base_centos_yum_repo_packages = [
136
+    'centos-release-qemu-ev',
135 137
     'epel-release',
136 138
     'yum-plugin-priorities'
137 139
 ] %}
@@ -139,14 +141,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
139 141
 {% if base_arch == 'x86_64' %}
140 142
     {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
141 143
         '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
142
-        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
143
-        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
144
+        '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage'
144 145
     ] %}
145 146
 
146 147
     {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
147 148
         'centos-release-ceph-luminous',
148
-        'centos-release-opstools',
149
-        'centos-release-qemu-ev'
149
+        'centos-release-opstools'
150 150
     ] %}
151 151
 {% endif %}
152 152
 

Loading…
Cancel
Save