Update OpenSearch and OpenSearch Dashboards to version 3.x

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

Change-Id: I4507fb60d361ea504459a4b502d6f6c42a327064

5 files changed, 32 insertions, 28 deletions

diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
index 9de20ec66..9d4e2624f 100644
--- a/doc/source/contributor/versions.rst
+++ b/doc/source/contributor/versions.rst
@@ -21,7 +21,7 @@ information about package sources.
  Logstash       7.x                `Logstash install guide`_
  MariaDB        10.11 (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`_
  Rabbitmq       4.0.x              - CentOS/Rocky:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
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
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 6b66aec1d..d0bfed99f 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -11,8 +11,8 @@ centos:
   hacluster: "highavailability"
   influxdb: "influxdb"
   mariadb: "mariadb"
-  opensearch: "opensearch-2.x"
-  opensearch-dashboards: "opensearch-dashboards-2.x"
+  opensearch: "opensearch-3.x"
+  opensearch-dashboards: "opensearch-dashboards-3.x"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
   proxysql: "proxysql"
@@ -30,8 +30,8 @@ centos-aarch64:
   hacluster: "highavailability"
   influxdb: "influxdb"
   mariadb: "mariadb"
-  opensearch: "opensearch-2.x"
-  opensearch-dashboards: "opensearch-dashboards-2.x"
+  opensearch: "opensearch-3.x"
+  opensearch-dashboards: "opensearch-dashboards-3.x"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
   proxysql: "proxysql"
@@ -72,12 +72,12 @@ debian:
     component: "main"
     gpg_key: "mariadb.gpg"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
@@ -124,12 +124,12 @@ debian-aarch64:
     component: "main"
     gpg_key: "mariadb.gpg"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
@@ -159,8 +159,8 @@ rocky:
   hacluster: "highavailability"
   influxdb: "influxdb"
   mariadb: "mariadb"
-  opensearch: "opensearch-2.x"
-  opensearch-dashboards: "opensearch-dashboards-2.x"
+  opensearch: "opensearch-3.x"
+  opensearch-dashboards: "opensearch-dashboards-3.x"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
   proxysql: "proxysql"
@@ -178,8 +178,8 @@ rocky-aarch64:
   influxdb: "influxdb"
   hacluster: "highavailability"
   mariadb: "mariadb"
-  opensearch: "opensearch-2.x"
-  opensearch-dashboards: "opensearch-dashboards-2.x"
+  opensearch: "opensearch-3.x"
+  opensearch-dashboards: "opensearch-dashboards-3.x"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
   proxysql: "proxysql"
@@ -218,12 +218,12 @@ ubuntu:
     component: "main"
     gpg_key: "mariadb.gpg"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
@@ -271,12 +271,12 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "mariadb.gpg"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
   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"
     component: "main"
     gpg_key: "opensearch.asc"
diff --git a/releasenotes/notes/opensearch-upgrade-9e263a65f015a376.yaml b/releasenotes/notes/opensearch-upgrade-9e263a65f015a376.yaml
new file mode 100644
index 000000000..d7e00e331
--- /dev/null
+++ b/releasenotes/notes/opensearch-upgrade-9e263a65f015a376.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Update OpenSearch and OpenSearch Dashboards to version 3.x.