aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-07-19 16:06:27 +0000
committerGerrit Code Review <review@openstack.org>2019-07-19 16:06:27 +0000
commit8b17129bd233c84feb1e8967e1d11dd2fac92ea6 (patch)
tree9d37401b7185848fbf37c8ac1b398a59342cfdc8 /docker/base
parentc73815347e2e6a456c29dc1f6d93d7ed5c8f7c59 (diff)
parentd4d82fe18ecb679295301d4b54ade29d11090656 (diff)
downloadkolla-8b17129bd233c84feb1e8967e1d11dd2fac92ea6.tar.gz
kolla-8b17129bd233c84feb1e8967e1d11dd2fac92ea6.zip
Merge "base: enable elasticsearch and rabbitmq repos for centos/aarch64"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j26
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b93e378f9..01f613bff 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -94,11 +94,15 @@ COPY yum.conf /etc/yum.conf
] %}
{% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = [
- 'grafana.repo'
+ 'elasticsearch.repo',
+ 'grafana.repo',
+ 'rabbitmq_rabbitmq-server.repo'
] %}
{% set base_yum_repo_keys = [
+ 'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.grafana.com/gpg.key',
+ 'https://packagecloud.io/gpg.key',
] %}
{% endif %}