From bf86273cafbbff0ba3eb8227d3e3be1854866e5b Mon Sep 17 00:00:00 2001 From: Piotr Milewski Date: Mon, 12 May 2025 09:12:11 +0200 Subject: Update OpenSearch and OpenSearch Dashboards to version 3.x Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/949478 Change-Id: I4507fb60d361ea504459a4b502d6f6c42a327064 --- docker/base/Dockerfile.j2 | 6 +++--- docker/base/opensearch.repo | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5765ee8e0..b3181558c 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -155,8 +155,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos9-storage', 'epel', 'influxdb', - 'opensearch-2.x', - 'opensearch-dashboards-2.x', + 'opensearch-3.x', + 'opensearch-dashboards-3.x', ] %} {% if base_arch == 'aarch64' %} @@ -308,7 +308,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {'name': 'grafana', 'url': 'https://rpm.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': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch-release.pgp'}, {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-3.0.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 index 19f91c3bc..63caa75f8 100644 --- a/docker/base/opensearch.repo +++ b/docker/base/opensearch.repo @@ -1,19 +1,19 @@ -[opensearch-2.x] -name=OpenSearch 2.x -baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/yum +[opensearch-3.x] +name=OpenSearch 3.x +baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum enabled=0 repo_gpgcheck=1 gpgcheck=1 -gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp +gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.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 +[opensearch-dashboards-3.x] +name=OpenSearch Dashboards 3.x +baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum enabled=0 repo_gpgcheck=1 gpgcheck=1 -gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp +gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp autorefresh=1 type=rpm-md -- cgit v1.2.3