From aab455c5eb063b5e843bc0919bbae8f1687cf1d5 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 19 Apr 2023 12:25:56 +0200
Subject: opensearch: move to yum/apt repos

systemd-tmpfiles is needed otherwise opensearch
postinst on Debian/Ubuntu fails

Change-Id: I5aeb5796f8de7697a1c4a7404fe292ef9eb522ee
(cherry picked from commit 6bd7898a1d95157c713bdff0fe5bdf5a59b65550)
---
 docker/base/Dockerfile.j2   |  4 ++++
 docker/base/opensearch.repo | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 docker/base/opensearch.repo

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 00bf3d2af..f056a8349 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -57,6 +57,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
     'grafana.repo',
     'influxdb.repo',
     'mariadb.repo',
+    'opensearch.repo',
     'proxysql.repo',
     'rabbitmq_rabbitmq-server.repo',
     'td.repo',
@@ -157,6 +158,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos-rabbitmq-38',
     'epel',
     'influxdb',
+    'opensearch-2.x',
+    'opensearch-dashboards-2.x',
 ] %}
 
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
@@ -294,6 +297,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
+   {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'},
    {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key'},
    {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
 ] %}
diff --git a/docker/base/opensearch.repo b/docker/base/opensearch.repo
new file mode 100644
index 000000000..19f91c3bc
--- /dev/null
+++ b/docker/base/opensearch.repo
@@ -0,0 +1,19 @@
+[opensearch-2.x]
+name=OpenSearch 2.x
+baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/yum
+enabled=0
+repo_gpgcheck=1
+gpgcheck=1
+gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp
+autorefresh=1
+type=rpm-md
+
+[opensearch-dashboards-2.x]
+name=OpenSearch Dashboards 2.x
+baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/yum
+enabled=0
+repo_gpgcheck=1
+gpgcheck=1
+gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp
+autorefresh=1
+type=rpm-md
-- 
cgit v1.2.3