Install networking-mlnx

This was removed in the Gazpacho update. This restores the plugins into the
neutron and nova containers.

Author: jovial

etc/kayobe/kolla.yml

@@ -165,10 +165,18 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
     reference: stackhpc/{{ openstack_release }}
+  neutron-server-plugin-networking-mlnx:
+    type: git
+    location: https://opendev.org/x/networking-mlnx
+    reference: stable/{{ openstack_release }}
   nova-base:
     type: git
     location: https://github.com/stackhpc/nova.git
     reference: stackhpc/{{ openstack_release }}
+  nova-compute-plugin-networking-mlnx:
+    type: git
+    location: https://opendev.org/x/networking-mlnx
+    reference: stable/{{ openstack_release }}
   openstack-base:
     type: git
     location: https://github.com/stackhpc/requirements.git
@@ -216,6 +224,20 @@ kolla_build_blocks:
 # Hyphens in the image name must be replaced with underscores. The
 # customization is most commonly packages. The operation should be one of
 # override, append or remove. The value should be a list.
+ethtool_packages:
+  rocky:
+    - libnl3-devel
+    - pkg-config
+    - gcc
+    - python3-devel
+  ubuntu:
+    - libnl-3-dev
+    - libnl-route-3-dev
+    - libnl-genl-3-dev
+    - build-essential
+    - pkg-config
+    - python3-dev
+
 kolla_build_customizations_common:
   bifrost_base_pip_packages_append:
     - /additions/*
@@ -226,12 +248,12 @@ kolla_build_customizations_common:
   magnum_base_pip_packages_override:
     - /magnum[osprofiler]
     - magnum-capi-helm==1.3.0
-  neutron_server_packages_append:
-    - python3-libvirt
-  nova_compute_packages_append:
-    - python3-libvirt
-  neutron_mlnx_agent_pip_packages_override:
-    - networking-mlnx@git+https://opendev.org/x/networking-mlnx@master
+  neutron_server_packages_append: "{{ ['python3-libvirt'] + ethtool_packages[kolla_base_distro] }}"
+  neutron_server_pip_packages_append:
+    - ethtool
+  nova_compute_packages_append: "{{ ['python3-libvirt'] + ethtool_packages[kolla_base_distro] }}"
+  nova_compute_pip_packages_append:
+    - ethtool
 
 #stackhpc_kolla_build_customizations:
 

releasenotes/notes/restore-networking-mlnx-e5763f696020610c.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Restores the ``networking-mlnx`` plugin to the Neutron Server and Nova
+    Compute containers. This was inadvertently removed during the Gazpacho
+    update.