From e221ac8f2704a21461f9b36134816329a43272cc Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 6 Dec 2022 14:06:55 +0100
Subject: Drop elasticsearch, kibana and logstash

Support has been dropped in kolla-ansible, the upgrade path is opensearch.

Change-Id: I6f32aacb4e0b7dd1eb7206e02425b16f5beae4f0
---
 docker/base/Dockerfile.j2          | 6 ------
 docker/base/apt_preferences.debian | 6 ------
 docker/base/apt_preferences.ubuntu | 6 ------
 docker/base/elasticsearch.repo     | 6 ------
 4 files changed, 24 deletions(-)
 delete mode 100644 docker/base/elasticsearch.repo

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 09b01dc61..2d9ade3c9 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -62,10 +62,6 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {% endblock %}
 
 #### BEGIN REPO ENABLEMENT
-{#
-Repo files not available for CentOS Stream 9:
-    'elasticsearch.repo',  # signed with SHA1 key https://github.com/elastic/elasticsearch/issues/85876
- #}
 {% set base_yum_repo_files = [
     'grafana.repo',
     'influxdb.repo',
@@ -80,7 +76,6 @@ Repo files not available for CentOS Stream 9:
 
 {#
 SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
-    'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
     'https://packages.grafana.com/gpg.key',
  #}
 {% set base_yum_repo_keys = [
@@ -320,7 +315,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 
 {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
 {% set base_remote_apt_keys = [
-   {'name': 'elasticsearch', 'url': 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'},
    {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdb.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index ba7e14b7f..7b5d4631b 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -6,12 +6,6 @@ Package: erlang*
 Pin: version 1:25.*
 Pin-Priority: 1000
 
-# NOTE(mgoddard): logstash 7.9.x is the last version that supports
-# Elasticsearch OSS.
-Package: logstash-oss
-Pin: version 7.9.*
-Pin-Priority: 1000
-
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bullseye-backports
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index d6a262861..8e6a9070f 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -6,12 +6,6 @@ Package: erlang*
 Pin: version 1:25.*
 Pin-Priority: 1000
 
-# NOTE(mgoddard): logstash 7.9.x is the last version that supports
-# Elasticsearch OSS.
-Package: logstash-oss
-Pin: version 7.9.*
-Pin-Priority: 1000
-
 Package: *
 Pin: origin dlm.mariadb.com
 Pin-Priority: 1000
diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo
deleted file mode 100644
index 06725a607..000000000
--- a/docker/base/elasticsearch.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[elasticsearch-kibana-logstash-7.x]
-name=ELK repository for 7.x packages
-baseurl=https://artifacts.elastic.co/packages/oss-7.x/yum
-gpgcheck=1
-gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
-enabled=0
-- 
cgit v1.2.3