Add support of SRIOV with OVN

Make sure sriov daemonset is enabled on ovn with sriov. Related-Prod: PRODX-47749 Change-Id: I716901fb96b9c923aa1d23d1dcff050427321144
Mirantis · Dec 19, 2024 · eac01f5 · eac01f5
1 parent a09121c
commit eac01f5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/rockoon/templates/services/networking.yaml b/rockoon/templates/services/networking.yaml
@@ -363,7 +363,7 @@ spec:
       {%- endfor %}
     {%- endif %}
     # TODO(vsaienko): implement ovn + dpdk support
-    {%- if dpdk.enabled and neutron_node_specific%}
+    {%- if dpdk.enabled and neutron_node_specific %}
         openvswitch_openvswitch-vswitchd:
           labels:
     {%- for label, override in neutron_node_specific.items() %}
@@ -754,7 +754,6 @@ spec:
         daemonset_l3_agent: false
         daemonset_lb_agent: false
         daemonset_ovs_agent: false
-        daemonset_sriov_agent: false
         daemonset_netns_cleanup_cron: false
         pod_rally_test: false
       {%- endif %}

diff --git a/tests/fixtures/render_service_template/output/networking/caracal_ceph_local_ovn_non_dvr.yaml b/tests/fixtures/render_service_template/output/networking/caracal_ceph_local_ovn_non_dvr.yaml
@@ -544,7 +544,6 @@ spec:
         daemonset_l3_agent: false
         daemonset_lb_agent: false
         daemonset_ovs_agent: false
-        daemonset_sriov_agent: false
         daemonset_ovn_vpn_agent: true
         pod_rally_test: false
         daemonset_netns_cleanup_cron: false

diff --git a/...tures/render_service_template/output/networking/caracal_ceph_local_ovn_non_dvr_sriov.yaml b/...tures/render_service_template/output/networking/caracal_ceph_local_ovn_non_dvr_sriov.yaml
@@ -546,8 +546,8 @@ spec:
         daemonset_l3_agent: false
         daemonset_lb_agent: false
         daemonset_ovs_agent: false
-        daemonset_sriov_agent: false
         daemonset_ovn_vpn_agent: true
+        daemonset_sriov_agent: true
         pod_rally_test: false
         daemonset_netns_cleanup_cron: false
       network:

diff --git a/tests/fixtures/render_service_template/output/networking/ussuri_ceph_local_tf.yaml b/tests/fixtures/render_service_template/output/networking/ussuri_ceph_local_tf.yaml
@@ -422,7 +422,6 @@ spec:
         daemonset_lb_agent: false
         daemonset_metadata_agent: false
         daemonset_ovs_agent: false
-        daemonset_sriov_agent: false
         daemonset_netns_cleanup_cron: false
         pod_rally_test: false
       network:

diff --git a/...s/fixtures/render_service_template/output/networking/victoria_ceph_local_ovn_non_dvr.yaml b/...s/fixtures/render_service_template/output/networking/victoria_ceph_local_ovn_non_dvr.yaml
@@ -541,7 +541,6 @@ spec:
         daemonset_l3_agent: false
         daemonset_lb_agent: false
         daemonset_ovs_agent: false
-        daemonset_sriov_agent: false
         pod_rally_test: false
         daemonset_netns_cleanup_cron: false
       network: