From 19f6d1fc158235166773ef2e3ba8728dc2cf4d71 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Fri, 4 Aug 2017 00:07:51 -0400
Subject: Add support for nosdn-ovs-dpdk scenario

Change-Id: I31fca214b7d16cecc261137567fa7ecf63abfe04
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 build/opnfv-environment.yaml  |  7 ++++---
 build/ovs-dpdk-preconfig.yaml | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'build')

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 67cba9fc..0847d7d0 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -17,9 +17,10 @@ parameter_defaults:
   # # Kernel arguments, this value will be set to kernel arguments specified
   # # for compute nodes in deploy setting file.
   # ComputeKernelArgs:
-  # PmdCoreList:
-  # OvsDpdkCoreList:
-  # OvsDpdkSocketMemory:
+  # NeutronDpdkCoreList:
+  # HostCpusList:
+  # NeutronDpdkSocketMemory:
+  # NeutronDpdkMemoryChannels:
   # ControllerExtraConfig:
   # NovaComputeExtraConfig:
   ExtraConfig:
diff --git a/build/ovs-dpdk-preconfig.yaml b/build/ovs-dpdk-preconfig.yaml
index 91cd6e13..bfa0b174 100644
--- a/build/ovs-dpdk-preconfig.yaml
+++ b/build/ovs-dpdk-preconfig.yaml
@@ -7,16 +7,16 @@ description: >
 parameters:
   server:
     type: string
-  OvsDpdkCoreList:
+  HostCpusList:
     description: >
       List of logical cores for OVS DPDK
     type: string
     default: ""
-  OvsDpdkSocketMemory:
+  NeutronDpdkSocketMemory:
     description: Memory allocated for each socket
     default: ""
     type: string
-  PmdCoreList:
+  NeutronDpdkCoreList:
     description: >
       A list or range of physical CPU cores to be pinned to PMD
       The given args will be appended to the tuned cpu-partitioning profile.
@@ -96,9 +96,9 @@ resources:
             systemctl restart openvswitch
 
           params:
-            $DPDK_CORES: {get_param: OvsDpdkCoreList}
-            $PMD_CORES: {get_param: PmdCoreList}
-            $SOCKET_MEMORY: {get_param: OvsDpdkSocketMemory}
+            $DPDK_CORES: {get_param: HostCpusList}
+            $PMD_CORES: {get_param: NeutronDpdkCoreList}
+            $SOCKET_MEMORY: {get_param: NeutronDpdkSocketMemory}
 outputs:
   deploy_stdout:
     description: Output of the extra dpdk ovs  deployment
-- 
cgit