diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-07 13:17:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-07 13:17:05 +0000 |
| commit | cd1f1f1ff3a0280f2820e4d0e73b96d14ed9f1e2 (patch) | |
| tree | 086f7b4028a013e7082146ff772b23f7c71d2965 | |
| parent | e1919fc2a69f6b2c5e228c8e6be032825f495e0f (diff) | |
| parent | eb321e4827c9cb73861168ba8dcc488a7e9a9eb1 (diff) | |
| download | kolla-cd1f1f1ff3a0280f2820e4d0e73b96d14ed9f1e2.tar.gz kolla-cd1f1f1ff3a0280f2820e4d0e73b96d14ed9f1e2.zip | |
Merge "centos: clean altarch repositories situation a bit"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fc713d5e3..cb389afe3 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 {% 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 %} |