summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-03-21 12:22:38 -0400
committerTim Rozet <trozet@redhat.com>2017-03-30 20:00:15 +0000
commitbc28dc258e2852d68a8b16f31903b80d4d6c8e27 (patch)
treeed0662d4b4a2a7ee14a8956472a1ca1616f99d1e
parent8300dc9ab70a051d627c1ed67486a38ee74f213a (diff)
Add core pinning settings for VPP
Also updated os-net-config to enable VPP service on startup, as well as updating show interfaces command. JIRA: APEX-407 os-net-config-pr: 6 opnfv-tht-pr: 129 Change-Id: I77c590e966d2532d894ec96bb60ffdf914a90f6d Signed-off-by: Feng Pan <fpan@redhat.com>
-rw-r--r--build/opnfv-environment.yaml4
-rwxr-xr-xlib/overcloud-deploy-functions.sh16
2 files changed, 20 insertions, 0 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 0018aa9..0910a5f 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -16,6 +16,8 @@ parameter_defaults:
#PmdCoreList: 1
#OvsDpdkCoreList: 2
#OvsDpdkSocketMemory: 1024
+ #ControllerExtraConfig:
+ #NovaComputeExtraConfig:
ExtraConfig:
tripleo::ringbuilder::build_ring: False
nova::nova_public_key:
@@ -115,6 +117,7 @@ parameter_defaults:
- OS::TripleO::Services::Congress
- OS::TripleO::Services::NeutronVppAgent
- OS::TripleO::Services::OVNDBs
+ - OS::TripleO::Services::Vpp
ComputeServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CephClient
@@ -140,3 +143,4 @@ parameter_defaults:
- OS::TripleO::Services::VipHosts
- OS::TripleO::Services::NeutronHoneycombAgent
- OS::TripleO::Services::NeutronVppAgent
+ - OS::TripleO::Services::Vpp
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index e7abdd0..c6a97f2 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -201,6 +201,22 @@ EOI
if [ -n "${deploy_options_array['performance']}" ]; then
ovs_dpdk_perf_flag="False"
for option in "${performance_options[@]}" ; do
+ if [ "${arr[1]}" == "vpp" ]; then
+ if [ "${arr[0]}" == "Compute" ]; then
+ role='NovaCompute'
+ else
+ role=${arr[0]}
+ fi
+ if [ "${arr[2]}" == "main-core" ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ sed -i "/${role}ExtraConfig:/ c\ ${role}ExtraConfig:\n fdio::vpp_cpu_main_core: \"'${arr[3]}'\"" ${ENV_FILE}
+EOI
+ elif [ "${arr[2]}" == "corelist-workers" ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ sed -i "/${role}ExtraConfig:/ c\ ${role}ExtraConfig:\n fdio::vpp_cpu_corelist_workers: \"'${arr[3]}'\"" ${ENV_FILE}
+EOI
+ fi
+ fi
arr=($option)
# use compute's kernel settings for all nodes for now.
if [ "${arr[0]}" == "Compute" ] && [ "${arr[1]}" == "kernel" ]; then