Merge pull request #349 from stackhpc/upstream/2023.1-2024-09-23

Synchronise 2023.1 with upstream
stackhpc · Sep 23, 2024 · 0b8d51b · 0b8d51b
2 parents 8f6b8cd + 6a788a0
commit 0b8d51b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -10,12 +10,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
     {% set cinder_backup_packages = [
         'device-mapper-multipath',
-        'nfs-utils'
+        'lsscsi',
+        'nfs-utils',
+        'sysfsutils'
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set cinder_backup_packages = [
+        'lsscsi',
         'multipath-tools',
-        'nfs-common'
+        'nfs-common',
+        'sysfsutils'
     ] %}
 {% endif %}
 

diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
@@ -10,7 +10,20 @@ 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']) }}
 
-{% set opensearch_dashboards_packages = ['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 %}
 
 {{ 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
@@ -0,0 +1,3 @@
+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
@@ -0,0 +1,9 @@
+---
+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>`__