diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-16 10:19:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-16 10:19:41 +0000 |
| commit | 28ab9cb45162597fb8fec7bd8069b713488ad472 (patch) | |
| tree | 585de2d837381548116448d3043c856202f44668 /docker/base/Dockerfile.j2 | |
| parent | ee51c125b3f76f354d9fdf4d7fbc9e8b55a385e3 (diff) | |
| parent | 6ce67b81a70226913a1d19f0aefd2181c42d1cc6 (diff) | |
| download | kolla-28ab9cb45162597fb8fec7bd8069b713488ad472.tar.gz kolla-28ab9cb45162597fb8fec7bd8069b713488ad472.zip | |
Merge "CentOS 8: enable elasticsearch and kibana images"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a0a0ffebe..f6a67d9e9 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -82,6 +82,7 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen {% if base_arch == 'x86_64' %} {% set base_yum_repo_files = [ + 'elasticsearch.repo', 'grafana.repo', 'influxdb.repo', 'rabbitmq_rabbitmq-server.repo', @@ -90,19 +91,15 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # 'crmsh.repo', - # 'elasticsearch.repo', # 'opendaylight.repo', {% 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://www.rabbitmq.com/rabbitmq-release-signing-key.asc', 'https://packages.treasuredata.com/GPG-KEY-td-agent', ] %} - # FIXME(mgoddard): Not available for CentOS 8 yet. - # - # 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', - # {% elif base_arch == 'aarch64' %} {% set base_yum_repo_files = [ 'grafana.repo', |