Merge pull request #489 from stackhpc/upstream/master-2025-10-27

Synchronise master with upstream

Author: priteau

ansible/inventory/group_vars/all/kolla

@@ -208,7 +208,7 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_multipathd | bool }}"
   - regex: "neutron-\\(server\\|metadata-agent\\)"
     enabled: "{{ kolla_enable_neutron | bool }}"
-  - regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
+  - regex: "neutron-\\(dhcp\\|l3\\|openvswitch\\)-agent"
     enabled: "{{ kolla_build_neutron_ovs | default(kolla_enable_neutron | bool and not kolla_enable_ovn | bool) }}"
   - regex: neutron-bgp-dragent
     enabled: "{{ kolla_enable_neutron_bgp_dragent | bool }}"

ansible/roles/kolla-ansible/templates/kolla/globals.yml

@@ -119,7 +119,7 @@ docker_registry_username: "{{ kolla_docker_registry_username }}"
 #bifrost_network_address_family: "{% raw %}{{ network_address_family }}{% endraw %}"
 #dns_address_family: "{% raw %}{{ network_address_family }}{% endraw %}"
 
-# Valid options are [ openvswitch, linuxbridge ]
+# Valid options are [ openvswitch, ovn ]
 neutron_plugin_agent: "{% if kolla_enable_ovn | default(False) | bool %}ovn{% else %}openvswitch{% endif %}"
 
 # Valid options are [ internal, infoblox ]

playbooks/kayobe-base/pre.yml

@@ -15,7 +15,7 @@
       callbacks_enabled = ansible.posix.profile_tasks
 
       # Improve readability of ansible output.
-      stdout_callback = yaml
+      callback_result_format = yaml
 
       [ssh_connection]
       # NOTE(wszusmki): Disable pipelining due to:
@@ -36,7 +36,7 @@
       callbacks_enabled = ansible.posix.profile_tasks
 
       # Improve readability of ansible output.
-      stdout_callback = yaml
+      callback_result_format = yaml
 
       [ssh_connection]
       # NOTE(wszusmki): Disable pipelining due to:

releasenotes/notes/remove-linuxbridge-0112ace7c0bff24b.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Support for Linux Bridge mechanism driver has been removed. The driver was
+    already removed from neutron.