summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/opnfv-environment.yaml7
-rw-r--r--build/ovs-dpdk-preconfig.yaml12
-rw-r--r--config/deploy/os-nosdn-ovs_dpdk-ha.yaml1
-rw-r--r--config/deploy/os-nosdn-ovs_dpdk-noha.yaml1
-rwxr-xr-xlib/overcloud-deploy-functions.sh9
5 files changed, 17 insertions, 13 deletions
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
diff --git a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
index 94ffb9ab..147b1555 100644
--- a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
+++ b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
@@ -24,3 +24,4 @@ deploy_options:
socket_memory: 1024
pmd_cores: 2
dpdk_cores: 1
+ memory_channels: 1
diff --git a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
index ec6baa67..b5e44fdc 100644
--- a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
+++ b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
@@ -24,3 +24,4 @@ deploy_options:
socket_memory: 1024
pmd_cores: 2
dpdk_cores: 1
+ memory_channels: 1
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 8c5e0828..bfa98e54 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -16,9 +16,10 @@ function overcloud_deploy {
local dpdk_cores pmd_cores socket_mem ovs_dpdk_perf_flag ovs_option_heat_arr
declare -A ovs_option_heat_arr
- ovs_option_heat_arr['dpdk_cores']=OvsDpdkCoreList
- ovs_option_heat_arr['pmd_cores']=PmdCoreList
- ovs_option_heat_arr['socket_memory']=OvsDpdkSocketMemory
+ ovs_option_heat_arr['dpdk_cores']=HostCpusList
+ ovs_option_heat_arr['pmd_cores']=NeutronDpdkCoreList
+ ovs_option_heat_arr['socket_memory']=NeutronDpdkSocketMemory
+ ovs_option_heat_arr['memory_channels']=NeutronDpdkMemoryChannels
# OPNFV Default Environment and Network settings
DEPLOY_OPTIONS+=" -e ${ENV_FILE}"
@@ -232,7 +233,7 @@ EOI
for ovs_option in ${!ovs_option_heat_arr[@]}; do
if [ -n "${!ovs_option}" ]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
- sed -i "/${ovs_option_heat_arr[$ovs_option]}:/c\ ${ovs_option_heat_arr[$ovs_option]}: ${!ovs_option}" ${ENV_FILE}
+ sed -i "/${ovs_option_heat_arr[$ovs_option]}:/c\ ${ovs_option_heat_arr[$ovs_option]}: '${!ovs_option}'" ${ENV_FILE}
EOI
fi
done