diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-10 15:12:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-10 15:12:01 +0000 |
| commit | b5c8b595a7f9c4aebb35b0ceacc236ec5f4eb350 (patch) | |
| tree | 26a388d4b47a60367f55e7cfc368200131da39d2 /docker/base/Dockerfile.j2 | |
| parent | e03558cc4113f9c3a376d4e64779f6c610f7519b (diff) | |
| parent | de58339a0e1704ae1ade4e032a73bb4708ecfaf1 (diff) | |
| download | kolla-b5c8b595a7f9c4aebb35b0ceacc236ec5f4eb350.tar.gz kolla-b5c8b595a7f9c4aebb35b0ceacc236ec5f4eb350.zip | |
Merge "Fix issues with Percona in Zuul and clean up a little bit"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b61a6a989..fda528330 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -64,10 +64,6 @@ COPY yum.conf /etc/yum.conf #### BEGIN REPO ENABLEMENT -# Workaround https://bugs.launchpad.net/kolla/+bug/1813906 -# https://jira.percona.com/browse/PT-1685 -COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY - {% set base_yum_repo_files = [ ] %} @@ -90,13 +86,12 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY 'td.repo' ] %} + ## NOTE(yoctozepto): Percona keys omitted on purpose (handled via the repo file for compatibility with Zuul) {% set base_yum_repo_keys = [ 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', - 'https://www.percona.com/downloads/RPM-GPG-KEY-percona', - '/etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY', 'https://packages.treasuredata.com/GPG-KEY-td-agent' ] %} {% elif base_arch == 'aarch64' %} |