Reintroduce networking-mlnx

stackhpc · Aug 5, 2024 · a018688 · a018688
1 parent 73da718
commit a018688
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -147,6 +147,12 @@ 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
+    # FIXME(wszumski): Last stable release is stable/yoga
+    #reference: stable/{{ openstack_release }}
+    reference: master
   octavia-api-plugin-ovn-octavia-provider:
     type: git
     location: https://github.com/stackhpc/ovn-octavia-provider.git
@@ -155,6 +161,12 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/ovn-octavia-provider.git
     reference: stackhpc/{{ openstack_release }}
+  nova-compute-plugin-networking-mlnx:
+    type: git
+    location: https://opendev.org/x/networking-mlnx
+    # FIXME(wszumski): Last stable release is stable/yoga
+    #reference: stable/{{ openstack_release }}
+    reference: master 
 
 ###############################################################################
 # Kolla image build configuration.
@@ -347,6 +359,12 @@ kolla_build_blocks:
     {% set magnum_capi_packages = ['magnum-capi-helm==1.0.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
@@ -439,6 +457,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:
   ovn_base_packages_override:

diff --git 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