Merge pull request #445 from stackhpc/upstream/2025.1-2025-07-21

Synchronise 2025.1 with upstream

Author: priteau

docker/base/Dockerfile.j2

@@ -249,7 +249,7 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \
 
 {% block base_ubuntu_package_sources_list %}
 {% if base_distro == 'debian' or ( base_distro == 'ubuntu' and base_arch == 'x86_64' ) %}
-RUN rm -f /etc/apt/sources.list.d/debian.sources
+RUN rm -f /etc/apt/sources.list.d/{{ base_distro }}.sources
 COPY sources.list.{{ base_distro }} /etc/apt/sources.list
 {% else %}
 COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list

docker/base/sources.list.ubuntu

@@ -3,11 +3,9 @@
 # Default repos
 deb mirror://mirrors.ubuntu.com/mirrors.txt noble main universe
 deb mirror://mirrors.ubuntu.com/mirrors.txt noble-updates main universe
+deb mirror://mirrors.ubuntu.com/mirrors.txt noble-backports main universe
 deb mirror://mirrors.ubuntu.com/mirrors.txt noble-security main universe
 
-# Backports have a lower priority and must be explicitly installed to be used
-deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe
-
 # We need to add the repo for the updated packages they provide. The main ones
 # are qemu, libvirt, and openvswitch.
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/epoxy main

docker/glance/glance-api/Dockerfile.j2

@@ -9,11 +9,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set glance_api_packages = [
+        'lsscsi',
         'device-mapper-multipath',
         'qemu-img'
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set glance_api_packages = [
+        'lsscsi',
         'multipath-tools',
         'nfs-common',
         'qemu-utils'

docker/ovn/ovn-base/extend_start.sh

@@ -9,3 +9,5 @@ fi
 if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then
     chmod 755 /var/log/kolla/openvswitch
 fi
+
+. /usr/local/bin/kolla_ovn_extend_start

docker/ovn/ovn-controller/Dockerfile.j2

@@ -20,6 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% endif %}
 {{ macros.install_packages(ovn_controller_packages | customizable("packages")) }}
 
+COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
+
 {{ macros.kolla_patch_sources() }}
 
 {% block ovn_controller_footer %}{% endblock %}

docker/ovn/ovn-controller/extend_start.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [[ ! -r "/var/log/kolla/openvswitch/ovn-controller.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovn-controller.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-controller.log
+fi

docker/ovn/ovn-nb-db-server/Dockerfile.j2

@@ -22,6 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 COPY start_nb_db_server.sh /usr/local/bin/start-nb-db-server
 RUN chmod 755 /usr/local/bin/start-nb-db-server
+COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 
 {{ macros.kolla_patch_sources() }}
 

docker/ovn/ovn-nb-db-server/extend_start.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [[ ! -r "/var/log/kolla/openvswitch/ovn-nb-db.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovn-nb-db.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-nb-db.log
+fi

docker/ovn/ovn-northd/Dockerfile.j2

@@ -20,6 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% endif %}
 {{ macros.install_packages(ovn_northd_packages | customizable("packages")) }}
 
+COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
+
 {{ macros.kolla_patch_sources() }}
 
 {% block ovn_northd_footer %}{% endblock %}

docker/ovn/ovn-northd/extend_start.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [[ ! -r "/var/log/kolla/openvswitch/ovn-northd.log" ]]; then
+    touch /var/log/kolla/openvswitch/ovn-northd.log
+    chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-northd.log
+fi