Updated templates for ovs-dpdk site type

[yaml_builds.git] / site_type / ovsdpdk / templates / profiles / host / cp-r01.j2

diff --git a/site_type/ovsdpdk/templates/profiles/host/cp-r01.j2 b/site_type/ovsdpdk/templates/profiles/host/cp-r01.j2
index e66e85c..f715ccb 100644 (file)
--- a/site_type/ovsdpdk/templates/profiles/host/cp-r01.j2
+++ b/site_type/ovsdpdk/templates/profiles/host/cp-r01.j2
@@ -57,18 +57,12 @@ data:
         - 'storage'
         - 'overlay'
         - 'calico'
-    p1p1:
+    dpdk:
+      device_link: dpdk
       slaves:
-        - 'sriov_nic01'
-      sriov:
-        vf_count: 32 # Currently ignored
-        trustedmode: false
-    p3p2:
-      slaves:
-        - 'sriov_nic02'
-      sriov:
-        vf_count: 32 # Currently ignored
-        trustedmode: false
+        - '{{yaml.networks.vxlan.interface}}'
+      networks:
+        - dpdk
   storage:
     physical_devices:
 {% for disk in yaml.disks %}
@@ -93,15 +87,20 @@ data:
     image: 'xenial'
     kernel: 'hwe-16.04'
     kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+      {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
       console: 'ttyS1,115200n8'
       intel_iommu: 'on'
       iommu: 'pt'
       amd_iommu: 'on'
       transparent_hugepage: 'never'
-      hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
-      hugepages: 'hardwareprofile:hugepages.dpdk.count'
-      default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
-      isolcpus: 'hardwareprofile:cpuset.kvm'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+      isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
   metadata:
     owner_data:
       control-plane: enabled