Skip to content

Commit b80b2be

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Revert "Pin OpenSearch Dashboards to 2.15"" into stable/2023.1
2 parents 1455ba6 + 2f52071 commit b80b2be

File tree

3 files changed

+1
-26
lines changed

3 files changed

+1
-26
lines changed

docker/opensearch/opensearch-dashboards/Dockerfile.j2

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1010
{{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
1111
{{ macros.enable_extra_repos(['opensearch-dashboards']) }}
1212

13-
# NOTE(mgoddard): Pinning to 2.15 due to https://bugs.launchpad.net/kolla/+bug/2077319
14-
{% if base_package_type == 'deb' %}
15-
COPY apt_preferences_opensearch_dashboards /etc/apt/preferences.d/opensearch_dashboards
16-
{% endif %}
17-
18-
{% if base_package_type == 'rpm' %}
19-
{% set opensearch_dashboards_packages = [
20-
'opensearch-dashboards-2.15.*'
21-
] %}
22-
{% elif base_package_type == 'deb' %}
23-
{% set opensearch_dashboards_packages = [
24-
'opensearch-dashboards'
25-
] %}
26-
{% endif %}
13+
{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
2714

2815
{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}
2916

docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards

Lines changed: 0 additions & 3 deletions
This file was deleted.

releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)