Merge pull request #351 from stackhpc/upstream/2023.1-2024-09-27

Synchronise 2023.1 with upstream

Author: priteau

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -22,6 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'systemd-udev',
         'util-linux',
         'xfsprogs',
+        'genisoimage',
+        'syslinux',
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set ironic_conductor_packages = [
@@ -38,6 +40,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'shellinabox',
         'udev',
         'xfsprogs',
+        'genisoimage',
+        'isolinux',
     ] %}
 {% endif %}
 

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")) }}
 

docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixed ironic-conductor missing packages genisoimage and syslinux/isolinux.