1 files changed, 17 insertions, 2 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
index 20f9b3c1e..b63555339 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
@@ -11,7 +11,7 @@
 {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
 {%- set nics = { nm.cmp001.nic_mgmt: True, nm.cmp001.nic_private: True } %}
 {%- set vlans = { nm.vlan_mgmt: nm.cmp001.nic_mgmt } %}
-{%- if '-ovs-' not in conf.MCP_DEPLOY_SCENARIO %}
+{%- if '-ovs-' not in conf.MCP_DEPLOY_SCENARIO and '-fdio-' not in conf.MCP_DEPLOY_SCENARIO %}
 {%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
 {%- do vlans.update({ vlan_private_start: nm.cmp001.nic_private }) %}
 {%- endif %}
@@ -19,6 +19,7 @@
 parameters:
   _param:
     # Should later be determined via PDF/IDF, AArch64 has ESP on /dev/sda1
+{%- if nm.cmp001.idx < conf.nodes | length %}
 {%- if conf.nodes[nm.cmp001.idx].node.type == 'virtual' %}
     ~cinder_lvm_devices: ['/dev/vdb']
 {%- elif conf.nodes[nm.cmp001.idx].node.arch == 'aarch64' or
@@ -27,14 +28,28 @@ parameters:
 {%- else %}
     ~cinder_lvm_devices: ['/dev/sda1']
 {%- endif %}
+{%- endif %}
   linux:
     network:
+{%- if '-fdio-' not in conf.MCP_DEPLOY_SCENARIO %}
       ovs_nowait: true
       bridge: openvswitch
+{%- else %}
+      dpdk:
+        enabled: true
+        driver: "${_param:compute_dpdk_driver}"
+      vpp:
+        enabled: true
+        decimal_interface_names: true
+        # Reuse ovs-dpdk socket mem configuration from IDF
+        dpdk_socket_mem: ${_param:compute_ovs_dpdk_socket_mem}
+        main_core: ${linux:system:kernel:isolcpu}
+        gid: 'neutron'
+{%- endif %}
       interface:
         pxe_admin_int:
           enabled: true
-          name: {{ nm.cmp001.nic_admin }}
+          name: ${_param:pxe_admin_interface}
           proto: static
           type: eth
           address: ${_param:pxe_admin_address}