diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-27 12:15:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-27 12:15:39 +0000 |
| commit | 382a467f3bb46846d5ea1849032f41afe2266808 (patch) | |
| tree | 660aacd1d7d17e0082151d0cd166466edfeef4b1 | |
| parent | 0644a5df860f4a131e7a0b210651039da043e431 (diff) | |
| parent | c862b076f71643bd9062ed6f8131e0570edfd441 (diff) | |
| download | kolla-382a467f3bb46846d5ea1849032f41afe2266808.tar.gz kolla-382a467f3bb46846d5ea1849032f41afe2266808.zip | |
Merge "Revert "Pin OpenSearch Dashboards to 2.15""
3 files changed, 1 insertions, 26 deletions
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index ee3ffa41b..a4bbd29f4 100644 --- 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 deleted file mode 100644 index 78bcda585..000000000 --- a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards +++ /dev/null @@ -1,3 +0,0 @@ -Package: opensearch-dashboards -Pin: version 2.15.* -Pin-Priority: 1000 diff --git a/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml b/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml deleted file mode 100644 index 7a259609f..000000000 --- a/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -fixes: - - | - Fixes an `issue - <https://github.com/opensearch-project/OpenSearch-Dashboards/issues/7626>`__ - in the OpenSearch Dashboards image where the discover page would hang after - initial deployment when there is no index pattern. This has been resolved - by reverting OpenSearch Dashboards to version 2.15. - `LP#2077319 <https://bugs.launchpad.net/kolla/+bug/2077319>`__ |