Skip to content

Commit 6d1427b

Browse files
committed
Clean networking-mlnx package deps
1 parent bfd3fee commit 6d1427b

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

etc/kayobe/kolla.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -422,18 +422,6 @@ kolla_build_blocks:
422422
rm -f liblasso3_2.7.0-2build3_amd64.deb
423423
{% endif %}
424424
{% 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-
RUN python3 -m pip --no-cache-dir install /plugins/* \
432-
&& dnf install python3-libvirt python3-ethtool -y \
433-
&& dnf clean all
434-
{% endif %}
435-
{% endraw %}
436-
{% endif %}
437425
nova_base_footer: |
438426
{% if kolla_base_distro == 'centos' %}
439427
# Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e.
@@ -444,18 +432,6 @@ kolla_build_blocks:
444432
{% endif %}
445433
{% endraw %}
446434
{% endif %}
447-
nova_compute_footer: |
448-
{% if kolla_base_distro in ['centos', 'rocky'] %}
449-
# Install networking-mlnx plugin and dependencies
450-
{% raw %}
451-
{% if base_package_type == 'rpm' %}
452-
ADD plugins-archive /
453-
RUN python3 -m pip --no-cache-dir install /plugins/* \
454-
&& dnf install python3-libvirt python3-ethtool -y \
455-
&& dnf clean all
456-
{% endif %}
457-
{% endraw %}
458-
{% endif %}
459435
magnum_base_footer: |
460436
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
461437
{% raw %}
@@ -480,6 +456,12 @@ kolla_build_customizations_common:
480456
- /additions/*
481457
ironic_inspector_pip_packages_append:
482458
- /additions/*
459+
neutron_server_packages_append:
460+
- python3-libvirt
461+
- python3-ethtool
462+
nova_compute_packages_append:
463+
- python3-libvirt
464+
- python3-ethtool
483465

484466
kolla_build_customizations_el:
485467
base_yum_repo_files_remove:

0 commit comments

Comments
 (0)