summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-04 00:07:51 -0400
committerFeng Pan <fpan@redhat.com>2017-08-04 13:34:08 -0400
commit19f6d1fc158235166773ef2e3ba8728dc2cf4d71 (patch)
treedaf9033219dd9398d50dd3812ee337e7e40ed457 /lib/overcloud-deploy-functions.sh
parentb375c4bfb86367c039e0e1f7c507d086def8a790 (diff)
Add support for nosdn-ovs-dpdk scenario
Change-Id: I31fca214b7d16cecc261137567fa7ecf63abfe04 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh9
1 files changed, 5 insertions, 4 deletions
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