Skip to content

Commit d07ad0a

Browse files
committed
Reintroduce networking-mlnx
1 parent 821fcd8 commit d07ad0a

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ kolla_enable_magnum: true
2323
kolla_enable_manila: true
2424
kolla_enable_mariabackup: true
2525
kolla_enable_neutron_sriov: true
26+
kolla_enable_neutron_mlnx: true
2627
kolla_enable_octavia: true
2728
kolla_enable_opensearch: true
2829
kolla_enable_ovn: true

etc/kayobe/kolla.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,18 @@ kolla_sources:
142142
type: git
143143
location: https://github.com/stackhpc/networking-generic-switch.git
144144
reference: stackhpc/{{ openstack_release }}
145+
neutron-server-plugin-networking-mlnx:
146+
type: git
147+
location: https://opendev.org/x/networking-mlnx
148+
reference: stable/{{ openstack_release }}
145149
nova-base:
146150
type: git
147151
location: https://github.com/stackhpc/nova.git
148152
reference: stackhpc/{{ openstack_release }}
153+
nova-compute-plugin-networking-mlnx:
154+
type: git
155+
location: https://opendev.org/x/networking-mlnx
156+
reference: stable/{{ openstack_release }}
149157

150158
###############################################################################
151159
# Kolla image build configuration.
@@ -403,6 +411,17 @@ kolla_build_blocks:
403411
rm -f liblasso3_2.7.0-2build3_amd64.deb
404412
{% endif %}
405413
{% endraw %}
414+
neutron_server_footer: |
415+
{% if kolla_base_distro in ['centos', 'rocky'] %}
416+
# Install networking-mlnx plugin and dependencies
417+
{% raw %}
418+
{% if base_package_type == 'rpm' %}
419+
ADD plugins-archive /
420+
python3 -m pip --no-cache-dir install /plugins/* \
421+
&& dnf install python3-libvirt python3-ethtool
422+
{% endif %}
423+
{% endraw %}
424+
{% endif %}
406425
nova_base_footer: |
407426
{% if kolla_base_distro == 'centos' %}
408427
# Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e.
@@ -413,6 +432,17 @@ kolla_build_blocks:
413432
{% endif %}
414433
{% endraw %}
415434
{% endif %}
435+
nova_compute_footer: |
436+
{% if kolla_base_distro in ['centos', 'rocky'] %}
437+
# Install networking-mlnx plugin and dependencies
438+
{% raw %}
439+
{% if base_package_type == 'rpm' %}
440+
ADD plugins-archive /
441+
python3 -m pip --no-cache-dir install /plugins/* \
442+
&& dnf install python3-libvirt python3-ethtool
443+
{% endif %}
444+
{% endraw %}
445+
{% endif %}
416446
magnum_base_footer: |
417447
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
418448
{% raw %}

etc/kayobe/pulp.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ stackhpc_pulp_images_kolla:
638638
- neutron-dhcp-agent
639639
- neutron-l3-agent
640640
- neutron-metadata-agent
641+
- neutron-mlnx-agent
641642
- neutron-openvswitch-agent
642643
- neutron-server
643644
- neutron-sriov-agent

0 commit comments

Comments
 (0)