openstack/kolla
Code Issues Proposed changes

Update OpenSearch and OpenSearch Dashboards to version 3.x

Browse Source 
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/949478

Change-Id: I4507fb60d361ea504459a4b502d6f6c42a327064
This commit is contained in:
Piotr Milewski
2025-05-12 09:12:11 +02:00
committed by Michal Arbet
parent a4f68e1889
commit bf86273caf
5 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/contributor/versions.rst
View File

@@ -21,7 +21,7 @@ information about package sources.
Logstash 7.x `Logstash install guide`_ Logstash 7.x `Logstash install guide`_
MariaDB 10.11 (LTS) `MariaDB Community downloads`_ MariaDB 10.11 (LTS) `MariaDB Community downloads`_
Galera 26.4 (LTS) `MariaDB Community downloads`_ Galera 26.4 (LTS) `MariaDB Community downloads`_
OpenSearch 2.x `OpenSearch install guide`_ OpenSearch 3.x `OpenSearch install guide`_
ProxySQL 2.7.x `ProxySQL repository`_ ProxySQL 2.7.x `ProxySQL repository`_
Rabbitmq 4.0.x - CentOS/Rocky: Rabbitmq 4.0.x - CentOS/Rocky:
`Team RabbitMQ 'Cloudsmith' repo (RPM)`_ `Team RabbitMQ 'Cloudsmith' repo (RPM)`_

6
docker/base/Dockerfile.j2
View File

@@ -155,8 +155,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
'centos9-storage', 'centos9-storage',
'epel', 'epel',
'influxdb', 'influxdb',
'opensearch-2.x', 'opensearch-3.x',
'opensearch-dashboards-2.x', 'opensearch-dashboards-3.x',
] %} ] %}
{% if base_arch == 'aarch64' %} {% 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': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.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': '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': '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'}, {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
] %} ] %}

16
docker/base/opensearch.repo
View File

@@ -1,19 +1,19 @@
[opensearch-2.x] [opensearch-3.x]
name=OpenSearch 2.x name=OpenSearch 3.x
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/yum baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum
enabled=0 enabled=0
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=1 gpgcheck=1
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp
autorefresh=1 autorefresh=1
type=rpm-md type=rpm-md
[opensearch-dashboards-2.x] [opensearch-dashboards-3.x]
name=OpenSearch Dashboards 2.x name=OpenSearch Dashboards 3.x
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/yum baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum
enabled=0 enabled=0
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=1 gpgcheck=1
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp
autorefresh=1 autorefresh=1
type=rpm-md type=rpm-md

32
kolla/template/repos.yaml
View File

@@ -11,8 +11,8 @@ centos:
hacluster: "highavailability" hacluster: "highavailability"
influxdb: "influxdb" influxdb: "influxdb"
mariadb: "mariadb" mariadb: "mariadb"
opensearch: "opensearch-2.x" opensearch: "opensearch-3.x"
opensearch-dashboards: "opensearch-dashboards-2.x" opensearch-dashboards: "opensearch-dashboards-3.x"
openvswitch: "centos-nfv-openvswitch" openvswitch: "centos-nfv-openvswitch"
opstools: "centos-opstools" opstools: "centos-opstools"
proxysql: "proxysql" proxysql: "proxysql"
@@ -30,8 +30,8 @@ centos-aarch64:
hacluster: "highavailability" hacluster: "highavailability"
influxdb: "influxdb" influxdb: "influxdb"
mariadb: "mariadb" mariadb: "mariadb"
opensearch: "opensearch-2.x" opensearch: "opensearch-3.x"
opensearch-dashboards: "opensearch-dashboards-2.x" opensearch-dashboards: "opensearch-dashboards-3.x"
openvswitch: "centos-nfv-openvswitch" openvswitch: "centos-nfv-openvswitch"
opstools: "centos-opstools" opstools: "centos-opstools"
proxysql: "proxysql" proxysql: "proxysql"
@@ -72,12 +72,12 @@ debian:
component: "main" component: "main"
gpg_key: "mariadb.gpg" gpg_key: "mariadb.gpg"
opensearch: opensearch:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
opensearch-dashboards: opensearch-dashboards:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
@@ -124,12 +124,12 @@ debian-aarch64:
component: "main" component: "main"
gpg_key: "mariadb.gpg" gpg_key: "mariadb.gpg"
opensearch: opensearch:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
opensearch-dashboards: opensearch-dashboards:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
@@ -159,8 +159,8 @@ rocky:
hacluster: "highavailability" hacluster: "highavailability"
influxdb: "influxdb" influxdb: "influxdb"
mariadb: "mariadb" mariadb: "mariadb"
opensearch: "opensearch-2.x" opensearch: "opensearch-3.x"
opensearch-dashboards: "opensearch-dashboards-2.x" opensearch-dashboards: "opensearch-dashboards-3.x"
openvswitch: "centos-nfv-openvswitch" openvswitch: "centos-nfv-openvswitch"
opstools: "centos-opstools" opstools: "centos-opstools"
proxysql: "proxysql" proxysql: "proxysql"
@@ -178,8 +178,8 @@ rocky-aarch64:
influxdb: "influxdb" influxdb: "influxdb"
hacluster: "highavailability" hacluster: "highavailability"
mariadb: "mariadb" mariadb: "mariadb"
opensearch: "opensearch-2.x" opensearch: "opensearch-3.x"
opensearch-dashboards: "opensearch-dashboards-2.x" opensearch-dashboards: "opensearch-dashboards-3.x"
openvswitch: "centos-nfv-openvswitch" openvswitch: "centos-nfv-openvswitch"
opstools: "centos-opstools" opstools: "centos-opstools"
proxysql: "proxysql" proxysql: "proxysql"
@@ -218,12 +218,12 @@ ubuntu:
component: "main" component: "main"
gpg_key: "mariadb.gpg" gpg_key: "mariadb.gpg"
opensearch: opensearch:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
opensearch-dashboards: opensearch-dashboards:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
@@ -271,12 +271,12 @@ ubuntu-aarch64:
component: "main" component: "main"
gpg_key: "mariadb.gpg" gpg_key: "mariadb.gpg"
opensearch: opensearch:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"
opensearch-dashboards: opensearch-dashboards:
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/" url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
suite: "stable" suite: "stable"
component: "main" component: "main"
gpg_key: "opensearch.asc" gpg_key: "opensearch.asc"

4
releasenotes/notes/opensearch-upgrade-9e263a65f015a376.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
Update OpenSearch and OpenSearch Dashboards to version 3.x.