Merge pull request #427 from stackhpc/upstream/master-2025-06-16

Synchronise master with upstream

Author: priteau

docker/neutron/neutron-l3-agent/Dockerfile.j2

@@ -10,14 +10,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
    {% set neutron_l3_agent_packages = [
       'libreswan',
-      'radvd',
-      'dibbler-client',
+      'radvd'
    ] %}
 {% elif base_package_type == 'deb' %}
    {% set neutron_l3_agent_packages = [
       'strongswan',
       'radvd',
-      'dibbler-client',
       'libnetfilter-log1'
    ] %}
 {% endif %}

releasenotes/notes/remove-dibbler-537b80d88f9984f5.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix ``neutron-l3-agent`` image builds on Rocky Linux by removing
+    ``dibbler-client`` dependency. The package is no longer used in Neutron.
+    `LP#2112575 <https://bugs.launchpad.net/kolla/+bug/2112575>`__