From 5b53fdfd2a48be6544b014cfb4f72d14c6efd6b8 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Thu, 19 Sep 2024 14:58:37 +0100
Subject: [PATCH] (2024.1) Reintroduce networking-mlnx (#1294)

* (2024.1) Reintroduce networking-mlnx

* Adds built images
---
 etc/kayobe/environments/ci-builder/stackhpc-ci.yml |  1 +
 etc/kayobe/kolla-image-tags.yml                    |  6 ++++++
 etc/kayobe/kolla.yml                               | 14 ++++++++++++++
 etc/kayobe/pulp.yml                                |  1 +
 .../adds-networking-mlnx-05fdc10ea6132145.yaml     |  6 ++++++
 5 files changed, 28 insertions(+)
 create mode 100644 releasenotes/notes/adds-networking-mlnx-05fdc10ea6132145.yaml

diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index c38bf307b..e7f755d59 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -23,6 +23,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
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index a6cab04c4..15d771ff0 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -9,6 +9,12 @@ kolla_image_tags:
   heat:
     rocky-9: 2024.1-rocky-9-20240805T142526
     ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526
+  nova:
+    rocky-9: 2024.1-rocky-9-20240918T164436
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436
+  neutron:
+    rocky-9: 2024.1-rocky-9-20240918T164436
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436
   horizon:
     rocky-9: 2024.1-rocky-9-20240909T144917
     ubuntu-jammy: 2024.1-ubuntu-jammy-20240909T144917
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index b89b8513d..abb852ad4 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -138,6 +138,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.
@@ -341,6 +349,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:
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 82e0f79a4..8b2caf009 100644
--- a/etc/kayobe/pulp.yml
+++ b/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
diff --git a/releasenotes/notes/adds-networking-mlnx-05fdc10ea6132145.yaml b/releasenotes/notes/adds-networking-mlnx-05fdc10ea6132145.yaml
new file mode 100644
index 000000000..5f9e3a15b
--- /dev/null
+++ b/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.