(2023.1) Reintroduce networking-mlnx (#1211)

* Reintroduce networking-mlnx

* Use stackhpc fork

* Use images built from StackHPC branch

* Pin ironic neutron agent

This wasn't rebuilt

* Update kolla-image-tags.yml

* Remove WIP references

* Adds release note

* Update kolla-image-tags.yml

* Simplify

* Update etc/kayobe/kolla-image-tags.yml

---------

Co-authored-by: Tom Clark <tom@stackhpc.com>

Author: jovial

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -22,6 +22,7 @@ kolla_enable_magnum: true
 kolla_enable_manila: true
 kolla_enable_mariabackup: true
 kolla_enable_neutron_sriov: true
+kolla_enable_neutron_mlnx: true
 kolla_enable_octavia: true
 kolla_enable_opensearch: true
 kolla_enable_prometheus: true

etc/kayobe/kolla-image-tags.yml

@@ -30,10 +30,11 @@ kolla_image_tags:
   manila:
     rocky-9: 2023.1-rocky-9-20240809T102431
   neutron:
-    rocky-9: 2023.1-rocky-9-20240809T102431
+    rocky-9: 2023.1-rocky-9-20240916T114629
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20240916T114629
   nova:
-    rocky-9: 2023.1-rocky-9-20240723T140948
-    ubuntu-jammy: 2023.1-ubuntu-jammy-20240723T140948
+    rocky-9: 2023.1-rocky-9-20240916T114629
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20240916T114629
   octavia:
     rocky-9: 2023.1-rocky-9-20240730T090421
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240730T090421

etc/kayobe/kolla.yml

@@ -147,6 +147,14 @@ 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://github.com/stackhpc/networking-mlnx
+    reference: stackhpc/{{ openstack_release }}
+  nova-compute-plugin-networking-mlnx:
+    type: git
+    location: https://github.com/stackhpc/networking-mlnx
+    reference: stackhpc/{{ openstack_release }}
 
 ###############################################################################
 # Kolla image build configuration.
@@ -339,6 +347,12 @@ kolla_build_blocks:
     {% set magnum_capi_packages = ['magnum-capi-helm==1.1.0'] %}
     RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
     {% endraw %}
+  nova_compute_header:
+    # See: https://review.opendev.org/c/openstack/kolla/+/878663/1/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
+    RUN sed -e "s/^pyzmq===20.0.0/pyzmq==21.*/g" -i /requirements/upper-constraints.txt
+  neutron_server_header:
+    # See: https://review.opendev.org/c/openstack/kolla/+/878663/1/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
+    RUN sed -e "s/^pyzmq===20.0.0/pyzmq==21.*/g" -i /requirements/upper-constraints.txt
   prometheus_alertmanager_repository_version: | # 2023.1 kolla has 0.24.0
     {% raw %}
     ARG prometheus_alertmanager_version=0.26.0
@@ -431,6 +445,12 @@ kolla_build_customizations_common:
     - /additions/*
   ironic_inspector_pip_packages_append:
     - /additions/*
+  neutron_server_packages_append:
+    - python3-libvirt
+    - python3-ethtool
+  nova_compute_packages_append:
+    - python3-libvirt
+    - python3-ethtool
 
 kolla_build_customizations_rocky:
   kolla_toolbox_packages_remove:

etc/kayobe/pulp.yml

@@ -491,6 +491,7 @@ stackhpc_pulp_images_kolla:
   - neutron-dhcp-agent
   - neutron-l3-agent
   - neutron-metadata-agent
+  - neutron-mlnx-agent
   - neutron-openvswitch-agent
   - neutron-server
   - neutron-sriov-agent

releasenotes/notes/adds-networking-mlnx-05fdc10ea6132145.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds the ``networking-mlnx`` mechanism driver to the Neutron Server
+    container and ``ebrctl``utility to the Nova Compute container. This allows
+    you to use the ``kolla_enable_neutron_mlnx`` feature flag.