Merge pull request #811 from stackhpc/upstream/2025.1-2025-11-03

Synchronise 2025.1 with upstream

Author: priteau

ansible/group_vars/all.yml

@@ -314,9 +314,7 @@ dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}"
 ironic_http_interface_address: "{{ 'ironic_http' | kolla_address }}"
 ironic_tftp_interface_address: "{{ 'ironic_tftp' | kolla_address }}"
 
-# Valid options are [ openvswitch, ovn, linuxbridge, vmware_nsxv, vmware_nsxv3, vmware_nsxp, vmware_dvs ]
-# Do note linuxbridge is *EXPERIMENTAL* in Neutron since Zed and it requires extra tweaks to config to be usable.
-# For details, see: https://docs.openstack.org/neutron/latest/admin/config-experimental-framework.html
+# Valid options are [ openvswitch, ovn, vmware_nsxv, vmware_nsxv3, vmware_nsxp, vmware_dvs ]
 neutron_plugin_agent: "openvswitch"
 
 # Valid options are [ internal, infoblox ]
@@ -921,7 +919,7 @@ enable_nova_ssh: "yes"
 enable_octavia: "no"
 enable_octavia_driver_agent: "{{ enable_octavia | bool and neutron_plugin_agent == 'ovn' }}"
 enable_octavia_jobboard: "{{ enable_octavia | bool and 'amphora' in octavia_provider_drivers }}"
-enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
+enable_openvswitch: "{{ enable_neutron | bool }}"
 enable_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}"
 enable_ovn_sb_db_relay: "{{ enable_ovn | bool }}"
 enable_ovs_dpdk: "no"

ansible/roles/manila/templates/manila-share.conf.j2

@@ -74,8 +74,6 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres
 share_driver = manila.share.drivers.generic.GenericShareDriver
 {% if neutron_plugin_agent == "openvswitch" %}
 interface_driver = manila.network.linux.interface.OVSInterfaceDriver
-{% elif neutron_plugin_agent == "linuxbridge" %}
-interface_driver = manila.network.linux.interface.BridgeInterfaceDriver
 {% endif %}
 
 driver_handles_share_servers = true

ansible/roles/neutron/defaults/main.yml

@@ -51,24 +51,6 @@ neutron_services:
     volumes: "{{ neutron_openvswitch_agent_default_volumes + neutron_openvswitch_agent_extra_volumes }}"
     dimensions: "{{ neutron_openvswitch_agent_dimensions }}"
     healthcheck: "{{ neutron_openvswitch_agent_healthcheck }}"
-  neutron-linuxbridge-agent:
-    container_name: "neutron_linuxbridge_agent"
-    image: "{{ neutron_linuxbridge_agent_image_full }}"
-    privileged: True
-    enabled: "{{ neutron_plugin_agent == 'linuxbridge' }}"
-    environment:
-      KOLLA_LEGACY_IPTABLES: "{{ neutron_legacy_iptables | bool | lower }}"
-    host_in_groups: >-
-      {{
-      inventory_hostname in groups['compute']
-      or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-      or inventory_hostname in groups['neutron-dhcp-agent']
-      or inventory_hostname in groups['neutron-l3-agent']
-      or inventory_hostname in groups['neutron-metadata-agent']
-      }}
-    volumes: "{{ neutron_linuxbridge_agent_default_volumes + neutron_linuxbridge_agent_extra_volumes }}"
-    dimensions: "{{ neutron_linuxbridge_agent_dimensions }}"
-    healthcheck: "{{ neutron_linuxbridge_agent_healthcheck }}"
   neutron-dhcp-agent:
     cgroupns_mode: "{{ 'host' if neutron_agents_wrappers | bool else 'private' }}"
     container_name: "neutron_dhcp_agent"
@@ -249,8 +231,6 @@ neutron_config_validation:
     config: "/etc/neutron/l3_agent.ini"
   - generator: "/neutron/etc/oslo-config-generator/dhcp_agent.ini"
     config: "/etc/neutron/dhcp_agent.ini"
-  - generator: "/neutron/etc/oslo-config-generator/linuxbridge_agent.ini"
-    config: "/etc/neutron/plugins/ml2/linuxbridge_agent.ini"
 
 ####################
 # Database
@@ -299,10 +279,6 @@ neutron_eswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
 neutron_eswitchd_tag: "{{ neutron_mlnx_agent_tag }}"
 neutron_eswitchd_image_full: "{{ neutron_eswitchd_image }}:{{ neutron_eswitchd_tag }}"
 
-neutron_linuxbridge_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}neutron-linuxbridge-agent"
-neutron_linuxbridge_agent_tag: "{{ neutron_tag }}"
-neutron_linuxbridge_agent_image_full: "{{ neutron_linuxbridge_agent_image }}:{{ neutron_linuxbridge_agent_tag }}"
-
 neutron_metadata_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}neutron-metadata-agent"
 neutron_metadata_agent_tag: "{{ neutron_tag }}"
 neutron_metadata_agent_image_full: "{{ neutron_metadata_agent_image }}:{{ neutron_metadata_agent_tag }}"
@@ -350,7 +326,6 @@ neutron_l3_agent_dimensions: "{{ neutron_agent_dimensions }}"
 neutron_sriov_agent_dimensions: "{{ neutron_agent_dimensions }}"
 neutron_mlnx_agent_dimensions: "{{ neutron_agent_dimensions }}"
 neutron_eswitchd_dimensions: "{{ neutron_agent_dimensions }}"
-neutron_linuxbridge_agent_dimensions: "{{ neutron_agent_dimensions }}"
 neutron_metadata_agent_dimensions: "{{ neutron_agent_dimensions }}"
 neutron_ovn_metadata_agent_dimensions: "{{ neutron_agent_dimensions }}"
 neutron_openvswitch_agent_dimensions: "{{ neutron_agent_dimensions }}"
@@ -388,19 +363,6 @@ neutron_l3_agent_healthcheck:
   test: "{% if neutron_l3_agent_enable_healthchecks | bool %}{{ neutron_l3_agent_healthcheck_test }}{% else %}NONE{% endif %}"
   timeout: "{{ neutron_l3_agent_healthcheck_timeout }}"
 
-neutron_linuxbridge_agent_enable_healthchecks: "{{ enable_container_healthchecks }}"
-neutron_linuxbridge_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
-neutron_linuxbridge_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
-neutron_linuxbridge_agent_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-neutron_linuxbridge_agent_healthcheck_test: ["CMD-SHELL", "healthcheck_port neutron-linuxbridge-agent {{ om_rpc_port }}"]
-neutron_linuxbridge_agent_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
-neutron_linuxbridge_agent_healthcheck:
-  interval: "{{ neutron_linuxbridge_agent_healthcheck_interval }}"
-  retries: "{{ neutron_linuxbridge_agent_healthcheck_retries }}"
-  start_period: "{{ neutron_linuxbridge_agent_healthcheck_start_period }}"
-  test: "{% if neutron_linuxbridge_agent_enable_healthchecks | bool %}{{ neutron_linuxbridge_agent_healthcheck_test }}{% else %}NONE{% endif %}"
-  timeout: "{{ neutron_linuxbridge_agent_healthcheck_timeout }}"
-
 neutron_metadata_agent_enable_healthchecks: "no"
 neutron_metadata_agent_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
 neutron_metadata_agent_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
@@ -565,14 +527,6 @@ neutron_eswitchd_default_volumes:
   - "kolla_logs:/var/log/kolla/"
   - "{{ '/dev/shm:/dev/shm' }}"
   - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
-neutron_linuxbridge_agent_default_volumes:
-  - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "/lib/modules:/lib/modules:ro"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' }}"
-  - "{{ kolla_dev_repos_directory ~ '/neutron:/dev-mode/neutron' if neutron_dev_mode | bool else '' }}"
 neutron_metadata_agent_default_volumes:
   - "{{ node_config_directory }}/neutron-metadata-agent/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
@@ -650,7 +604,6 @@ neutron_l3_agent_extra_volumes: "{{ neutron_extra_volumes }}"
 neutron_sriov_agent_extra_volumes: "{{ neutron_extra_volumes }}"
 neutron_mlnx_agent_extra_volumes: "{{ neutron_extra_volumes }}"
 neutron_eswitchd_extra_volumes: "{{ neutron_extra_volumes }}"
-neutron_linuxbridge_agent_extra_volumes: "{{ neutron_extra_volumes }}"
 neutron_metadata_agent_extra_volumes: "{{ neutron_extra_volumes }}"
 neutron_ovn_metadata_agent_extra_volumes: "{{ neutron_extra_volumes }}"
 neutron_openvswitch_agent_extra_volumes: "{{ neutron_extra_volumes }}"
@@ -713,8 +666,6 @@ neutron_subprojects:
 # Mechanism drivers
 ####################
 mechanism_drivers:
-  - name: "linuxbridge"
-    enabled: "{{ neutron_plugin_agent == 'linuxbridge' }}"
   - name: "openvswitch"
     enabled: "{{ neutron_plugin_agent == 'openvswitch' }}"
   - name: "mlnx_infiniband"

ansible/roles/neutron/handlers/main.yml

@@ -46,22 +46,6 @@
     healthcheck: "{{ service.healthcheck | default(omit) }}"
   with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
 
-- name: Restart neutron-linuxbridge-agent container
-  vars:
-    service_name: "neutron-linuxbridge-agent"
-    service: "{{ neutron_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    environment: "{{ service.environment }}"
-    volumes: "{{ service.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ service.dimensions }}"
-    privileged: "{{ service.privileged | default(False) }}"
-    healthcheck: "{{ service.healthcheck | default(omit) }}"
-
 - name: Restart neutron-dhcp-agent container
   vars:
     service_name: "neutron-dhcp-agent"

ansible/roles/neutron/tasks/config-host.yml

@@ -8,7 +8,7 @@
     neutron_services |
     select_services_enabled_and_mapped_to_host |
     list |
-    intersect(["neutron-l3-agent", "neutron-linuxbridge-agent", "neutron-openvswitch-agent"]) |
+    intersect(["neutron-l3-agent", "neutron-openvswitch-agent"]) |
     list |
     length > 0
 

ansible/roles/neutron/tasks/config.yml

@@ -78,7 +78,6 @@
       - "ironic-neutron-agent"
       - "neutron-dhcp-agent"
       - "neutron-l3-agent"
-      - "neutron-linuxbridge-agent"
       - "neutron-metadata-agent"
       - "neutron-ovn-metadata-agent"
       - "neutron-metering-agent"
@@ -150,20 +149,6 @@
     - item.key in services_need_ml2_conf_ini
   with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
 
-- name: Copying over linuxbridge_agent.ini
-  become: true
-  vars:
-    service_name: "neutron-linuxbridge-agent"
-    service: "{{ neutron_services[service_name] }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/linuxbridge_agent.ini.j2"
-      - "{{ node_custom_config }}/neutron/linuxbridge_agent.ini"
-      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/linuxbridge_agent.ini"
-    dest: "{{ node_config_directory }}/{{ service_name }}/linuxbridge_agent.ini"
-    mode: "0660"
-  when: service | service_enabled_and_mapped_to_host
-
 - name: Copying over openvswitch_agent.ini
   become: true
   vars:
@@ -394,7 +379,6 @@
   vars:
     service_name: "{{ item.0 }}"
     services_need_ml2_conf_ini:
-      - "neutron-linuxbridge-agent"
       - "neutron-openvswitch-agent"
       - "neutron-server"
   template:

ansible/roles/neutron/templates/linuxbridge_agent.ini.j2

@@ -1,5 +1,5 @@
 {
-    "command": "neutron-server --config-file /etc/neutron/neutron.conf{% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'ovn'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini{% if enable_neutron_vpnaas | bool %} --config-file /etc/neutron/neutron_vpnaas.conf{% endif %}{% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %}{% if enable_neutron_fwaas | bool %} --config-file /etc/neutron/fwaas_driver.ini{% endif %}",
+    "command": "neutron-server --config-file /etc/neutron/neutron.conf{% if neutron_plugin_agent in ['openvswitch', 'ovn'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini{% if enable_neutron_vpnaas | bool %} --config-file /etc/neutron/neutron_vpnaas.conf{% endif %}{% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %}{% if enable_neutron_fwaas | bool %} --config-file /etc/neutron/fwaas_driver.ini{% endif %}",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",

ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2

@@ -25,8 +25,6 @@ state_path = /var/lib/neutron/kolla
 
 {% if neutron_plugin_agent == "openvswitch" or (neutron_plugin_agent == "ovn" and neutron_ovn_dhcp_agent | bool) %}
 interface_driver = openvswitch
-{% elif neutron_plugin_agent == "linuxbridge" %}
-interface_driver = linuxbridge
 {% endif %}
 
 {% if enable_nova_fake | bool %}