Merge pull request #612 from stackhpc/upstream/master-2026-08-24

Synchronise master with upstream

Author: priteau

ansible/idrac-bootstrap-one.yml

@@ -45,12 +45,10 @@
 - block:
     - name: Ensure DellOS6 switch interface is a member of the bootstrap VLAN
       dellos6_config:
-        provider: "{{ dell_switch_provider }}"
         lines:
           - "switchport access vlan {{ idrac_bootstrap_vlan }}"
         parents:
           - "interface {{ switch_interface_name }}"
-      delegate_to: localhost
       when: switch_type == 'dellos6'
 
     # The tasks in this block are delegated to the controller.
@@ -170,12 +168,10 @@
   always:
     - name: Ensure DellOS6 switch iDRAC interface is a member of the management VLAN
       dellos6_config:
-        provider: "{{ dell_switch_provider }}"
         lines:
           - "switchport access vlan {{ idrac_network_vlan }}"
         parents:
           - "interface {{ switch_interface_name }}"
-      delegate_to: localhost
       when: switch_type == 'dellos6'
 
   when: idrac_bootstrap_required

ansible/idrac-bootstrap.yml

@@ -116,7 +116,6 @@
     # interfaces to it.
     - role: dell-switch
       dell_switch_type: "{{ switch_type }}"
-      dell_switch_provider: "{{ switch_dellos_provider }}"
       dell_switch_config:
         - "vlan {{ idrac_bootstrap_vlan }}"
       dell_switch_interface_config: "{{ switch_interface_config_bootstrap }}"
@@ -147,7 +146,6 @@
       include_tasks: idrac-bootstrap-one.yml
       vars:
         dell_switch_type: "{{ switch_type }}"
-        dell_switch_provider: "{{ switch_dellos_provider }}"
         switch_interface_name: "{{ item.key }}"
         idrac_port_description: "{{ item.value.description }}"
         idrac_network_ip: "{{ idrac_network_ips[idrac_port_description] }}"
@@ -181,7 +179,6 @@
     # interfaces from it.
     - role: dell-switch
       dell_switch_type: "{{ switch_type }}"
-      dell_switch_provider: "{{ switch_dellos_provider }}"
       dell_switch_config:
         - "no vlan {{ idrac_bootstrap_vlan }}"
       dell_switch_interface_config: "{{ switch_interface_config_bootstrap }}"

ansible/inventory/group_vars/all/switches/dell

@@ -138,7 +138,6 @@
 
     - role: dell-switch
       dell_switch_type: "{{ switch_type }}"
-      dell_switch_provider: "{{ switch_dellos_provider }}"
       dell_switch_config: "{{ switch_config }}"
       dell_switch_interface_config: "{{ switch_interface_config }}"
       dell_switch_save: "{{ switch_config_save }}"

ansible/physical-network.yml

@@ -1,9 +1,9 @@
 Dell Switch
 ===========
 
-This role configures Dell switches using the `dellos6`, `dellos9`, or
-`dellos10` Ansible modules.  It provides a fairly minimal abstraction of the
-configuration interface provided by the `dellos` modules, allowing for
+This role configures Dell switches using the `dellemc.os6`, `dellemc.os9`, or
+`dellemc.os10` Ansible collections. It provides a fairly minimal abstraction of
+the configuration interface provided by the collections, allowing for
 application of arbitrary switch configuration options.
 
 Requirements
@@ -17,9 +17,6 @@ Role Variables
 `dell_switch_type` is the type of Dell switch. One of `dellos6`, `dellos9`, or
 `dellos10`.
 
-`dell_switch_provider` is authentication provider information passed as the
-`provider` argument to the `dellos` modules.
-
 `dell_switch_config` is a list of configuration lines to apply to the switch,
 and defaults to an empty list.
 
@@ -50,12 +47,6 @@ passwords.  It applies global configuration for LLDP, and enables two
       roles:
         - role: dell-switch
           dell_switch_type: "dellos9"
-          dell_switch_provider:
-            host: "{{ switch_host }}"
-            username: "{{ switch_user }}"
-            password: "{{ switch_password }}"
-            authorize: yes
-            auth_pass: "{{ switch_auth_pass }}"
           dell_switch_config:
             - "protocol lldp"
             - " advertise dot3-tlv max-frame-size"

ansible/roles/dell-switch/README.md

@@ -2,9 +2,6 @@
 # Type of Dell switch. One of dellos6, dellos9, or dellos10.
 dell_switch_type:
 
-# Authentication provider information.
-dell_switch_provider:
-
 # List of configuration lines to apply to the switch.
 dell_switch_config: []
 

ansible/roles/dell-switch/defaults/main.yml

@@ -1,24 +1,18 @@
 ---
 - name: Ensure DellOS6 switches are configured
-  delegate_to: localhost
-  dellemc.os6.os6:
-    provider: "{{ dell_switch_provider }}"
-    src: "{{ lookup('template', 'dellos6-config.j2') }}"
+  dellemc.os6.os6_config:  # noqa fqcn[canonical]
+    src: "../templates/dellos6-config.j2"
     save: "{{ dell_switch_save | bool }}"
   when: dell_switch_type == 'dellos6'
 
 - name: Ensure DellOS9 switches are configured
-  delegate_to: localhost
-  dellemc.os9.os9:
-    provider: "{{ dell_switch_provider }}"
-    src: "{{ lookup('template', 'dellos9-config.j2') }}"
+  dellemc.os9.os9_config:  # noqa fqcn[canonical]
+    src: "../templates/dellos9-config.j2"
     save: "{{ dell_switch_save | bool }}"
   when: dell_switch_type == 'dellos9'
 
 - name: Ensure DellOS10 switches are configured
-  delegate_to: localhost
-  dellemc.os10.os10:
-    provider: "{{ dell_switch_provider }}"
-    src: "{{ lookup('template', 'dellos10-config.j2') }}"
+  dellemc.os10.os10_config:  # noqa fqcn[canonical]
+    src: "../templates/dellos10-config.j2"
     save: "{{ dell_switch_save | bool }}"
   when: dell_switch_type == 'dellos10'

ansible/roles/dell-switch/tasks/main.yml

@@ -97,37 +97,6 @@
   with_items:
     - { name: pip }
 
-- block:
-    - name: Gather list of installed Python packages
-      pip_package_info:
-        clients: "{{ kolla_ansible_pip }}"
-      register: pip_packages
-
-    # Upgrading directly from Ansible 2.9 to Ansible 2.10 or from Ansible 2.10
-    # to Ansible 4 is known to cause problems. Uninstall Ansible first if its
-    # version is lower than 4.0.0. Although 2.10 is allowed by version limits,
-    # this is needed even it is present from Wallaby, because we request
-    # `state: latest`.
-    - name: Uninstall Ansible if an old version is present
-      pip:
-        name: ansible
-        state: absent
-        virtualenv: "{{ kolla_ansible_venv }}"
-        virtualenv_python: "{{ kolla_ansible_venv_python }}"
-      when:
-        - "'ansible' in pip_packages.packages[kolla_ansible_pip]"
-        - pip_packages.packages[kolla_ansible_pip].ansible[0].version is version('4.0.0', '<')
-
-    - name: Uninstall ansible-base
-      pip:
-        name: ansible-base
-        state: absent
-        virtualenv: "{{ kolla_ansible_venv }}"
-        virtualenv_python: "{{ kolla_ansible_venv_python }}"
-      when: "'ansible-base' in pip_packages.packages[kolla_ansible_pip]"
-  vars:
-    kolla_ansible_pip: "{{ kolla_ansible_venv }}/bin/pip"
-
 - name: Ensure required Python packages are installed
   vars:
     kolla_ansible_packages:

ansible/roles/kolla-ansible/tasks/install.yml

@@ -241,27 +241,22 @@ by Ansible:
 Dell OS6, OS9, and OS10
 -----------------------
 
-Configuration for these devices is applied using the ``dellos6_config``,
-``dellos9_config``, and ``dellos10_config`` Ansible modules.
+Configuration for these devices is applied using the
+``dellemc.os6.os6_config``, ``dellemc.os9.os9_config``, and
+``dellemc.os10.os10_config`` Ansible modules.
 
 ``switch_type`` should be set to ``dellos6``, ``dellos9``, or ``dellos10``.
 
 ``switch_config_save`` may be set to ``true`` to enable saving configuration
 after it has been applied.
 
-Provider
-^^^^^^^^
-
 * ``ansible_host`` is the hostname or IP address.  Optional.
-
 * ``ansible_user`` is the SSH username.
-
 * ``ansible_ssh_pass`` is the SSH password.
-
 * ``switch_auth_pass`` is the 'enable' password.
-
-Alternatively, set ``switch_dellos_provider`` to the value to be passed as the
-``provider`` argument to the ``dellos*_config`` module.
+* ``ansible_connection`` should be ``ansible.netcommon.network_cli``.
+* ``ansible_network_os`` should be ``dellemc.os6.os6``, ``dellemc.os9.os9`` or
+  ``dellemc.os10.os10`` depending on the switch type.
 
 Dell PowerConnect
 -----------------

doc/source/configuration/reference/physical-network.rst

@@ -519,6 +519,8 @@ def get_iface(name):
             # <network>_port_type_<portname>.
             for port in br_ports or []:
                 port_iface = get_iface(port)
+                if mtu:
+                    port_iface.setdefault("mtu", mtu)
                 if "type" not in port_iface:
                     # Check for explicit type configuration
                     port_type = networks.net_attr(
@@ -586,6 +588,22 @@ def get_iface(name):
                 parent = re.sub(
                     r'\.{}$'.format(vlan_id), '', iface_name)
 
+            # NOTE(bbezak): Do not pass MTU for VLAN interfaces on bridges when
+            # it is identical to the parent bridge, to work around a
+            # NetworkManager bug.
+            bridge_mtus = {}
+            for bridge in networks.net_select_bridges(
+                    context, names, inventory_hostname):
+                bridge_interface = networks.net_interface(
+                    context, bridge, inventory_hostname)
+                bridge_mtus[bridge_interface] = networks.net_mtu(
+                    context, bridge, inventory_hostname)
+
+            if parent in bridge_mtus:
+                parent_mtu = bridge_mtus[parent]
+                if mtu and mtu == parent_mtu:
+                    del iface["mtu"]
+
             iface["vlan"] = {
                 "base-iface": parent,
                 "id": int(vlan_id)