summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-07 13:17:05 +0000
committerGerrit Code Review <review@openstack.org>2018-08-07 13:17:05 +0000
commitcd1f1f1ff3a0280f2820e4d0e73b96d14ed9f1e2 (patch)
tree086f7b4028a013e7082146ff772b23f7c71d2965
parente1919fc2a69f6b2c5e228c8e6be032825f495e0f (diff)
parenteb321e4827c9cb73861168ba8dcc488a7e9a9eb1 (diff)
Merge "centos: clean altarch repositories situation a bit"
-rw-r--r--docker/base/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index fc713d5..cb389af 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -128,9 +128,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
128{% endblock %} 128{% endblock %}
129 129
130{% set base_centos_yum_repo_keys = [ 130{% set base_centos_yum_repo_keys = [
131 '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
131] %} 132] %}
132 133
133{% set base_centos_yum_repo_packages = [ 134{% set base_centos_yum_repo_packages = [
135 'centos-release-qemu-ev',
134 'epel-release', 136 'epel-release',
135 'yum-plugin-priorities' 137 'yum-plugin-priorities'
136] %} 138] %}
@@ -138,14 +140,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
138{% if base_arch == 'x86_64' %} 140{% if base_arch == 'x86_64' %}
139 {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [ 141 {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
140 '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools', 142 '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
141 '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', 143 '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage'
142 '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
143 ] %} 144 ] %}
144 145
145 {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ 146 {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
146 'centos-release-ceph-luminous', 147 'centos-release-ceph-luminous',
147 'centos-release-opstools', 148 'centos-release-opstools'
148 'centos-release-qemu-ev'
149 ] %} 149 ] %}
150{% endif %} 150{% endif %}
151 151