From d07ad0a2040c6dbd2598fa05ce4166e58efed2b0 Mon Sep 17 00:00:00 2001 From: Tom Clark Date: Tue, 18 Jun 2024 12:42:58 +0200 Subject: [PATCH 1/7] Reintroduce networking-mlnx --- .../environments/ci-builder/stackhpc-ci.yml | 1 + etc/kayobe/kolla.yml | 30 +++++++++++++++++++ etc/kayobe/pulp.yml | 1 + 3 files changed, 32 insertions(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 27ac8d858..91b977e3e 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_ovn: true diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 9773da8b1..64c77e2a0 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -142,10 +142,18 @@ 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 + reference: stable/{{ openstack_release }} nova-base: type: git location: https://github.com/stackhpc/nova.git reference: stackhpc/{{ openstack_release }} + nova-compute-plugin-networking-mlnx: + type: git + location: https://opendev.org/x/networking-mlnx + reference: stable/{{ openstack_release }} ############################################################################### # Kolla image build configuration. @@ -403,6 +411,17 @@ kolla_build_blocks: rm -f liblasso3_2.7.0-2build3_amd64.deb {% endif %} {% endraw %} + neutron_server_footer: | + {% if kolla_base_distro in ['centos', 'rocky'] %} + # Install networking-mlnx plugin and dependencies + {% raw %} + {% if base_package_type == 'rpm' %} + ADD plugins-archive / + python3 -m pip --no-cache-dir install /plugins/* \ + && dnf install python3-libvirt python3-ethtool + {% endif %} + {% endraw %} + {% endif %} nova_base_footer: | {% if kolla_base_distro == 'centos' %} # Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e. @@ -413,6 +432,17 @@ kolla_build_blocks: {% endif %} {% endraw %} {% endif %} + nova_compute_footer: | + {% if kolla_base_distro in ['centos', 'rocky'] %} + # Install networking-mlnx plugin and dependencies + {% raw %} + {% if base_package_type == 'rpm' %} + ADD plugins-archive / + python3 -m pip --no-cache-dir install /plugins/* \ + && dnf install python3-libvirt python3-ethtool + {% endif %} + {% endraw %} + {% endif %} magnum_base_footer: | RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash {% raw %} diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index c83366b41..80cd1753a 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -638,6 +638,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 From 2559f55dd2f6e78edc2abee57113cd99da1bde61 Mon Sep 17 00:00:00 2001 From: Tom Clark <161027899+tomclark0@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:57:12 +0200 Subject: [PATCH 2/7] Clean yum after usage --- etc/kayobe/kolla.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 64c77e2a0..e46bdb5b4 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -418,7 +418,8 @@ kolla_build_blocks: {% if base_package_type == 'rpm' %} ADD plugins-archive / python3 -m pip --no-cache-dir install /plugins/* \ - && dnf install python3-libvirt python3-ethtool + && dnf install python3-libvirt python3-ethtool -y \ + && dnf clean all {% endif %} {% endraw %} {% endif %} @@ -439,7 +440,8 @@ kolla_build_blocks: {% if base_package_type == 'rpm' %} ADD plugins-archive / python3 -m pip --no-cache-dir install /plugins/* \ - && dnf install python3-libvirt python3-ethtool + && dnf install python3-libvirt python3-ethtool -y \ + && dnf clean all {% endif %} {% endraw %} {% endif %} From bb47e672878aced22ce8d077cabec477d6b83062 Mon Sep 17 00:00:00 2001 From: Tom Clark Date: Wed, 3 Jul 2024 12:13:40 +0200 Subject: [PATCH 3/7] RUN required pip installs --- etc/kayobe/kolla.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index ad4ef1895..0d742e986 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -420,7 +420,7 @@ kolla_build_blocks: {% raw %} {% if base_package_type == 'rpm' %} ADD plugins-archive / - python3 -m pip --no-cache-dir install /plugins/* \ + RUN python3 -m pip --no-cache-dir install /plugins/* \ && dnf install python3-libvirt python3-ethtool -y \ && dnf clean all {% endif %} @@ -442,7 +442,7 @@ kolla_build_blocks: {% raw %} {% if base_package_type == 'rpm' %} ADD plugins-archive / - python3 -m pip --no-cache-dir install /plugins/* \ + RUN python3 -m pip --no-cache-dir install /plugins/* \ && dnf install python3-libvirt python3-ethtool -y \ && dnf clean all {% endif %} From 73c73ec2b278ff59cb2dfc59dd1440c17ba1b012 Mon Sep 17 00:00:00 2001 From: Tom Clark Date: Tue, 18 Jun 2024 12:42:58 +0200 Subject: [PATCH 4/7] Reintroduce networking-mlnx --- .../environments/ci-builder/stackhpc-ci.yml | 1 + etc/kayobe/kolla.yml | 30 +++++++++++++++++++ etc/kayobe/pulp.yml | 1 + 3 files changed, 32 insertions(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 821be0208..2cfb3fad2 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_ovn: true diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index f9500de08..b53896284 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -150,10 +150,18 @@ 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 + reference: stable/{{ openstack_release }} nova-base: type: git location: https://github.com/stackhpc/nova.git reference: stackhpc/{{ openstack_release }} + nova-compute-plugin-networking-mlnx: + type: git + location: https://opendev.org/x/networking-mlnx + reference: stable/{{ openstack_release }} ############################################################################### # Kolla image build configuration. @@ -414,6 +422,17 @@ kolla_build_blocks: rm -f liblasso3_2.7.0-2build3_amd64.deb {% endif %} {% endraw %} + neutron_server_footer: | + {% if kolla_base_distro in ['centos', 'rocky'] %} + # Install networking-mlnx plugin and dependencies + {% raw %} + {% if base_package_type == 'rpm' %} + ADD plugins-archive / + python3 -m pip --no-cache-dir install /plugins/* \ + && dnf install python3-libvirt python3-ethtool + {% endif %} + {% endraw %} + {% endif %} nova_base_footer: | {% if kolla_base_distro == 'centos' %} # Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e. @@ -424,6 +443,17 @@ kolla_build_blocks: {% endif %} {% endraw %} {% endif %} + nova_compute_footer: | + {% if kolla_base_distro in ['centos', 'rocky'] %} + # Install networking-mlnx plugin and dependencies + {% raw %} + {% if base_package_type == 'rpm' %} + ADD plugins-archive / + python3 -m pip --no-cache-dir install /plugins/* \ + && dnf install python3-libvirt python3-ethtool + {% endif %} + {% endraw %} + {% endif %} magnum_base_footer: | RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash {% raw %} diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 5b2e3d9e0..7093dcf15 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -660,6 +660,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 From 77e5b0e4a077a0ecc52ac1f451485d324330e8a0 Mon Sep 17 00:00:00 2001 From: Tom Clark <161027899+tomclark0@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:57:12 +0200 Subject: [PATCH 5/7] Clean yum after usage --- etc/kayobe/kolla.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index b53896284..34bc854aa 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -429,7 +429,8 @@ kolla_build_blocks: {% if base_package_type == 'rpm' %} ADD plugins-archive / python3 -m pip --no-cache-dir install /plugins/* \ - && dnf install python3-libvirt python3-ethtool + && dnf install python3-libvirt python3-ethtool -y \ + && dnf clean all {% endif %} {% endraw %} {% endif %} @@ -450,7 +451,8 @@ kolla_build_blocks: {% if base_package_type == 'rpm' %} ADD plugins-archive / python3 -m pip --no-cache-dir install /plugins/* \ - && dnf install python3-libvirt python3-ethtool + && dnf install python3-libvirt python3-ethtool -y \ + && dnf clean all {% endif %} {% endraw %} {% endif %} From a802e82456c9a369a7df4a526e1195d663ca6b41 Mon Sep 17 00:00:00 2001 From: Tom Clark Date: Wed, 3 Jul 2024 12:13:40 +0200 Subject: [PATCH 6/7] RUN required pip installs --- etc/kayobe/kolla.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 34bc854aa..3b304d138 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -428,7 +428,7 @@ kolla_build_blocks: {% raw %} {% if base_package_type == 'rpm' %} ADD plugins-archive / - python3 -m pip --no-cache-dir install /plugins/* \ + RUN python3 -m pip --no-cache-dir install /plugins/* \ && dnf install python3-libvirt python3-ethtool -y \ && dnf clean all {% endif %} @@ -450,7 +450,7 @@ kolla_build_blocks: {% raw %} {% if base_package_type == 'rpm' %} ADD plugins-archive / - python3 -m pip --no-cache-dir install /plugins/* \ + RUN python3 -m pip --no-cache-dir install /plugins/* \ && dnf install python3-libvirt python3-ethtool -y \ && dnf clean all {% endif %} From 6d1427b63f4f9e11ac0d0961e660be97f00b19e3 Mon Sep 17 00:00:00 2001 From: Tom Clark Date: Wed, 7 Aug 2024 10:01:31 +0200 Subject: [PATCH 7/7] Clean networking-mlnx package deps --- etc/kayobe/kolla.yml | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 3b304d138..420216f60 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -422,18 +422,6 @@ kolla_build_blocks: rm -f liblasso3_2.7.0-2build3_amd64.deb {% endif %} {% endraw %} - neutron_server_footer: | - {% if kolla_base_distro in ['centos', 'rocky'] %} - # Install networking-mlnx plugin and dependencies - {% raw %} - {% if base_package_type == 'rpm' %} - ADD plugins-archive / - RUN python3 -m pip --no-cache-dir install /plugins/* \ - && dnf install python3-libvirt python3-ethtool -y \ - && dnf clean all - {% endif %} - {% endraw %} - {% endif %} nova_base_footer: | {% if kolla_base_distro == 'centos' %} # Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e. @@ -444,18 +432,6 @@ kolla_build_blocks: {% endif %} {% endraw %} {% endif %} - nova_compute_footer: | - {% if kolla_base_distro in ['centos', 'rocky'] %} - # Install networking-mlnx plugin and dependencies - {% raw %} - {% if base_package_type == 'rpm' %} - ADD plugins-archive / - RUN python3 -m pip --no-cache-dir install /plugins/* \ - && dnf install python3-libvirt python3-ethtool -y \ - && dnf clean all - {% endif %} - {% endraw %} - {% endif %} magnum_base_footer: | RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash {% raw %} @@ -480,6 +456,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_el: base_yum_repo_files_remove: