Skip to content

Commit 73c73ec

Browse files
committed
Reintroduce networking-mlnx
1 parent e25cc4c commit 73c73ec

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
@@ -150,10 +150,18 @@ kolla_sources:
150150
type: git
151151
location: https://github.com/stackhpc/networking-generic-switch.git
152152
reference: stackhpc/{{ openstack_release }}
153+
neutron-server-plugin-networking-mlnx:
154+
type: git
155+
location: https://opendev.org/x/networking-mlnx
156+
reference: stable/{{ openstack_release }}
153157
nova-base:
154158
type: git
155159
location: https://github.com/stackhpc/nova.git
156160
reference: stackhpc/{{ openstack_release }}
161+
nova-compute-plugin-networking-mlnx:
162+
type: git
163+
location: https://opendev.org/x/networking-mlnx
164+
reference: stable/{{ openstack_release }}
157165

158166
###############################################################################
159167
# Kolla image build configuration.
@@ -414,6 +422,17 @@ kolla_build_blocks:
414422
rm -f liblasso3_2.7.0-2build3_amd64.deb
415423
{% endif %}
416424
{% endraw %}
425+
neutron_server_footer: |
426+
{% if kolla_base_distro in ['centos', 'rocky'] %}
427+
# Install networking-mlnx plugin and dependencies
428+
{% raw %}
429+
{% if base_package_type == 'rpm' %}
430+
ADD plugins-archive /
431+
python3 -m pip --no-cache-dir install /plugins/* \
432+
&& dnf install python3-libvirt python3-ethtool
433+
{% endif %}
434+
{% endraw %}
435+
{% endif %}
417436
nova_base_footer: |
418437
{% if kolla_base_distro == 'centos' %}
419438
# Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e.
@@ -424,6 +443,17 @@ kolla_build_blocks:
424443
{% endif %}
425444
{% endraw %}
426445
{% endif %}
446+
nova_compute_footer: |
447+
{% if kolla_base_distro in ['centos', 'rocky'] %}
448+
# Install networking-mlnx plugin and dependencies
449+
{% raw %}
450+
{% if base_package_type == 'rpm' %}
451+
ADD plugins-archive /
452+
python3 -m pip --no-cache-dir install /plugins/* \
453+
&& dnf install python3-libvirt python3-ethtool
454+
{% endif %}
455+
{% endraw %}
456+
{% endif %}
427457
magnum_base_footer: |
428458
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
429459
{% raw %}

etc/kayobe/pulp.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ stackhpc_pulp_images_kolla:
660660
- neutron-dhcp-agent
661661
- neutron-l3-agent
662662
- neutron-metadata-agent
663+
- neutron-mlnx-agent
663664
- neutron-openvswitch-agent
664665
- neutron-server
665666
- neutron-sriov-agent

0 commit comments

Comments
 (0)