X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site_type%2Fovsdpdk%2Ftemplates%2Fprofiles%2Fhost%2Fcompute-r01.j2;h=55387a5bbd22f2e54d4004d6b2629469b32d2c1f;hb=b1bc2e6844cb3efaacc1fc388c7e7602c0614481;hp=4e942be5a3ee960b67e9739b7eb73e2c8b691a11;hpb=fe885c06b13b6807209a76d0226a40d84ec61df3;p=yaml_builds.git

diff --git a/site_type/ovsdpdk/templates/profiles/host/compute-r01.j2 b/site_type/ovsdpdk/templates/profiles/host/compute-r01.j2
index 4e942be..55387a5 100644
--- a/site_type/ovsdpdk/templates/profiles/host/compute-r01.j2
+++ b/site_type/ovsdpdk/templates/profiles/host/compute-r01.j2
@@ -58,18 +58,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_compute %}
@@ -94,15 +88,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:
       openstack-nova-compute: enabled