From 6ce67b81a70226913a1d19f0aefd2181c42d1cc6 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 15 Apr 2020 10:26:20 +0100
Subject: [PATCH] CentOS 8: enable elasticsearch and kibana images

This is a follow up to I8b52b2630a72393bf4b9c7095fc67db6c36c27fa, which
upgraded elasticsearch and kibana to 6.x. It did not enable the
repositories or images for CentOS 8 however.

This change enables elasticsearch and kibana images for CentOS 8.

Change-Id: I7b375e493380c4e3d6b8c7b6f5ebc57c1b73043f
Related: blueprint elasticsearch-kibana-version-upgrade
---
 docker/base/Dockerfile.j2 | 7 ++-----
 kolla/image/build.py      | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a0a0ffebec..f6a67d9e9b 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',
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 7f5c833e43..3b971f682a 100755
--- a/kolla/image/build.py
+++ b/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