diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-21 16:44:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-21 16:44:35 +0000 |
| commit | ccb3ced1fbbb529884aae5f97d67bd707a7eafb4 (patch) | |
| tree | eb22440464cd1edd5739067c87c1fbba778c1df4 /docker/base | |
| parent | c8329d884fa231fad892543829f9ea5f9c5934ff (diff) | |
| parent | 20751763a211bd8246f7b3a41e4392220d10b9d1 (diff) | |
| download | kolla-ccb3ced1fbbb529884aae5f97d67bd707a7eafb4.tar.gz kolla-ccb3ced1fbbb529884aae5f97d67bd707a7eafb4.zip | |
Merge "Fix base CentOS repository keys"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ff00365db..afd463471 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -79,8 +79,7 @@ RUN yum-config-manager --enable rhel-7-server-rpms \ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 -{% set base_centos_yup_repo_keys = [ - '/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7', +{% set base_centos_yum_repo_keys = [ '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization' ] %} |