Browse Source

Merge "CentOS 8: enable elasticsearch and kibana images"

changes/17/710217/13
Zuul 2 years ago committed by Gerrit Code Review
parent
commit
28ab9cb451
  1. 7
      docker/base/Dockerfile.j2
  2. 2
      kolla/image/build.py

7
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',

2
kolla/image/build.py

@ -135,9 +135,7 @@ UNBUILDABLE_IMAGES = {
'centos': {
"cyborg-base", # package only for CentOS 7
"elasticsearch", # Missing elasticsearch repo
"hacluster-pcs", # Missing crmsh package
"kibana", # Missing elasticsearch repo
"mongodb", # Missing mongodb and mongodb-server packages
"nova-spicehtml5proxy", # Missing spicehtml5 package
"opendaylight", # Missing opendaylight repo

Loading…
Cancel
Save