Merge "Revert "Pin OpenSearch Dashboards to 2.15"" into stable/2024.1

stackhpc · Sep 27, 2024 · b3eaf7d · b3eaf7d
2 parents abf7a4c + d9639f0
commit b3eaf7d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
@@ -10,20 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
 {{ macros.enable_extra_repos(['opensearch-dashboards']) }}
 
-# NOTE(mgoddard): Pinning to 2.15 due to https://bugs.launchpad.net/kolla/+bug/2077319
-{% if base_package_type == 'deb' %}
-COPY apt_preferences_opensearch_dashboards /etc/apt/preferences.d/opensearch_dashboards
-{% endif %}
-
-{% if base_package_type == 'rpm' %}
-    {% set opensearch_dashboards_packages = [
-        'opensearch-dashboards-2.15.*'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set opensearch_dashboards_packages = [
-        'opensearch-dashboards'
-    ] %}
-{% endif %}
+{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
 
 {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}
 

diff --git a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards b/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards
diff --git a/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml b/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml