Fixed sriov in kernel mode

- in containers 'kernel' mode is used instead of vrouter
that leads to errors like 'missing network-functions-vrouter-vrouter'

- revert checks for dpdk: use wellknow word dpdk instead of
vrouter/kernel to define conditions like is_dpdk

Change-Id: Ic41ba975332b74555abd3d5a2ee280e439256cf1
Closes-Bug: #1791237

docker/services/contrail/contrail-vrouter-sriov.yaml

@@ -45,7 +45,7 @@ parameters:
     default: {}
     type: json
   ContrailSriovMode:
-    default: 'vrouter'
+    default: 'kernel'
     type: string
   RoleName:
     default: ''

extraconfig/pre_network/contrail/contrail_sriov_pre_network.yaml

@@ -66,7 +66,7 @@ parameters:
     description: DPDK Nic Driver
     type: string
   ContrailSriovMode:
-    default: 'vrouter'
+    default: 'kernel'
     type: string
   ContrailRegistry:
     default: 'opencontrailnightly'
@@ -128,7 +128,6 @@ resources:
         - name: _CONTRAIL_HUGEPAGES_2MB_
         - name: _CONTRAIL_VROUTER_MODULE_OPTS_
         - name: _CONTRAIL_VROUTER_PLUGIN_INIT_IMAGE_
-        - name: _CONTRAIL_SRIOV_MODE_
         - name: _CONTRAIL_SRIOV_NUM_VFS_
         - name: _IS_DPDK_
       outputs:
@@ -150,16 +149,15 @@ resources:
       input_values:
         _CONTRAIL_REGISTRY_: {get_param: ContrailRegistry}
         _CONTRAIL_IMAGETAG_: {get_param: ContrailImageTag}
-        _CONTRAIL_VROUTER_INIT_IMAGE_: {if: [{equals: [{get_param: ContrailSriovMode}, 'vrouter']}, {get_param: DockerContrailVrouterKernelInitImageName}, {get_param: DockerContrailVrouterKernelInitDpdkImageName}]}
+        _CONTRAIL_VROUTER_INIT_IMAGE_: {if: [{equals: [{get_param: ContrailSriovMode}, 'dpdk']}, {get_param: DockerContrailVrouterKernelInitDpdkImageName}, {get_param: DockerContrailVrouterKernelInitImageName}]}
         _CONTRAIL_VROUTER_AGENT_DPDK_CONTAINER_NAME_: {get_param: DockerContrailVrouterAgentDpdkContainerName}
         _CONTRAIL_VROUTER_AGENT_CONTAINER_NAME_: {get_param: DockerContrailVrouterAgentContainerName}
         _CONTRAIL_HUGEPAGES_1GB_: {get_param: ContrailSriovHugepages1GB}
         _CONTRAIL_HUGEPAGES_2MB_: {get_param: ContrailSriovHugepages2MB}
         _CONTRAIL_VROUTER_MODULE_OPTS_: {get_param: ContrailVrouterModuleOptions}
         _CONTRAIL_VROUTER_PLUGIN_INIT_IMAGE_: {get_param: DockerContrailVrouterPluginInitImageName}
-        _CONTRAIL_SRIOV_MODE_: {get_param: ContrailSriovMode}
         _CONTRAIL_SRIOV_NUM_VFS_: {get_param: ContrailSriovNumVFs}
-        _IS_DPDK_: {if:[{equals: [{get_param: ContrailSriovMode}, 'vrouter']}, '', 'True']}
+        _IS_DPDK_: {if: [{equals: [{get_param: ContrailSriovMode}, 'dpdk']}, 'True', '']}
 
   SriovKernelParametersConfig:
     type: OS::Heat::SoftwareConfig