Browse Source

Merge "centos: clean altarch repositories situation a bit"

tags/7.0.0.0rc1
Zuul 9 months ago
parent
commit
cd1f1f1ff3
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      docker/base/Dockerfile.j2

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

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

Loading…
Cancel
Save