Skip to content

Commit d8f5108

Browse files
vurmilAlex-Welsh
vurmil
authored and
Alex-Welsh
committed
Update OpenSearch and OpenSearch Dashboards to version 3.x
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/949478 Change-Id: I4507fb60d361ea504459a4b502d6f6c42a327064
1 parent eea02d2 commit d8f5108

File tree

5 files changed

+32
-28
lines changed

5 files changed

+32
-28
lines changed

‎doc/source/contributor/versions.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ information about package sources.
2121
Logstash 7.x `Logstash install guide`_
2222
MariaDB 10.11 (LTS) `MariaDB Community downloads`_
2323
Galera 26.4 (LTS) `MariaDB Community downloads`_
24-
OpenSearch 2.x `OpenSearch install guide`_
24+
OpenSearch 3.x `OpenSearch install guide`_
2525
ProxySQL 2.7.x `ProxySQL repository`_
2626
Rabbitmq 4.0.x - CentOS/Rocky:
2727
`Team RabbitMQ 'Cloudsmith' repo (RPM)`_

‎docker/base/Dockerfile.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
155155
'centos9-storage',
156156
'epel',
157157
'influxdb',
158-
'opensearch-2.x',
159-
'opensearch-dashboards-2.x',
158+
'opensearch-3.x',
159+
'opensearch-dashboards-3.x',
160160
] %}
161161

162162
{% if base_arch == 'aarch64' %}
@@ -308,7 +308,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
308308
{'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
309309
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
310310
{'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
311-
{'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'},
311+
{'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch-release.pgp'},
312312
{'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key'},
313313
{'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
314314
] %}

‎docker/base/opensearch.repo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
[opensearch-2.x]
2-
name=OpenSearch 2.x
3-
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/yum
1+
[opensearch-3.x]
2+
name=OpenSearch 3.x
3+
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum
44
enabled=0
55
repo_gpgcheck=1
66
gpgcheck=1
7-
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp
7+
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp
88
autorefresh=1
99
type=rpm-md
1010

11-
[opensearch-dashboards-2.x]
12-
name=OpenSearch Dashboards 2.x
13-
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/yum
11+
[opensearch-dashboards-3.x]
12+
name=OpenSearch Dashboards 3.x
13+
baseurl=https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum
1414
enabled=0
1515
repo_gpgcheck=1
1616
gpgcheck=1
17-
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch.pgp
17+
gpgkey=https://artifacts.opensearch.org/publickeys/opensearch-release.pgp
1818
autorefresh=1
1919
type=rpm-md

‎kolla/template/repos.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ centos:
1111
hacluster: "highavailability"
1212
influxdb: "influxdb"
1313
mariadb: "mariadb"
14-
opensearch: "opensearch-2.x"
15-
opensearch-dashboards: "opensearch-dashboards-2.x"
14+
opensearch: "opensearch-3.x"
15+
opensearch-dashboards: "opensearch-dashboards-3.x"
1616
openvswitch: "centos-nfv-openvswitch"
1717
opstools: "centos-opstools"
1818
proxysql: "proxysql"
@@ -30,8 +30,8 @@ centos-aarch64:
3030
hacluster: "highavailability"
3131
influxdb: "influxdb"
3232
mariadb: "mariadb"
33-
opensearch: "opensearch-2.x"
34-
opensearch-dashboards: "opensearch-dashboards-2.x"
33+
opensearch: "opensearch-3.x"
34+
opensearch-dashboards: "opensearch-dashboards-3.x"
3535
openvswitch: "centos-nfv-openvswitch"
3636
opstools: "centos-opstools"
3737
proxysql: "proxysql"
@@ -72,12 +72,12 @@ debian:
7272
component: "main"
7373
gpg_key: "mariadb.gpg"
7474
opensearch:
75-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
75+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
7676
suite: "stable"
7777
component: "main"
7878
gpg_key: "opensearch.asc"
7979
opensearch-dashboards:
80-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/"
80+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
8181
suite: "stable"
8282
component: "main"
8383
gpg_key: "opensearch.asc"
@@ -124,12 +124,12 @@ debian-aarch64:
124124
component: "main"
125125
gpg_key: "mariadb.gpg"
126126
opensearch:
127-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
127+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
128128
suite: "stable"
129129
component: "main"
130130
gpg_key: "opensearch.asc"
131131
opensearch-dashboards:
132-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/"
132+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
133133
suite: "stable"
134134
component: "main"
135135
gpg_key: "opensearch.asc"
@@ -159,8 +159,8 @@ rocky:
159159
hacluster: "highavailability"
160160
influxdb: "influxdb"
161161
mariadb: "mariadb"
162-
opensearch: "opensearch-2.x"
163-
opensearch-dashboards: "opensearch-dashboards-2.x"
162+
opensearch: "opensearch-3.x"
163+
opensearch-dashboards: "opensearch-dashboards-3.x"
164164
openvswitch: "centos-nfv-openvswitch"
165165
opstools: "centos-opstools"
166166
proxysql: "proxysql"
@@ -178,8 +178,8 @@ rocky-aarch64:
178178
influxdb: "influxdb"
179179
hacluster: "highavailability"
180180
mariadb: "mariadb"
181-
opensearch: "opensearch-2.x"
182-
opensearch-dashboards: "opensearch-dashboards-2.x"
181+
opensearch: "opensearch-3.x"
182+
opensearch-dashboards: "opensearch-dashboards-3.x"
183183
openvswitch: "centos-nfv-openvswitch"
184184
opstools: "centos-opstools"
185185
proxysql: "proxysql"
@@ -218,12 +218,12 @@ ubuntu:
218218
component: "main"
219219
gpg_key: "mariadb.gpg"
220220
opensearch:
221-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
221+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
222222
suite: "stable"
223223
component: "main"
224224
gpg_key: "opensearch.asc"
225225
opensearch-dashboards:
226-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/"
226+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
227227
suite: "stable"
228228
component: "main"
229229
gpg_key: "opensearch.asc"
@@ -271,12 +271,12 @@ ubuntu-aarch64:
271271
component: "main"
272272
gpg_key: "mariadb.gpg"
273273
opensearch:
274-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
274+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
275275
suite: "stable"
276276
component: "main"
277277
gpg_key: "opensearch.asc"
278278
opensearch-dashboards:
279-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/2.x/apt/"
279+
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
280280
suite: "stable"
281281
component: "main"
282282
gpg_key: "opensearch.asc"

‎releasenotes/notes/opensearch-upgrade-9e263a65f015a376.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
upgrade:
3+
- |
4+
Update OpenSearch and OpenSearch Dashboards to version 3.x.

0 commit comments

Comments
 (0)