diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-30 23:25:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-30 23:25:49 +0000 |
| commit | 28529146f87e5b725616c6574e69697410975f77 (patch) | |
| tree | ce9e397dfbdf9c0e5be683df8e5d2804b7036864 | |
| parent | 2a1c5597cf4f3c018b5064fded8cdb5637f98e68 (diff) | |
| parent | 48031aab02254a291a655813d5762a25105a636f (diff) | |
Merge "Add core pinning settings for VPP"
| -rw-r--r-- | build/opnfv-environment.yaml | 4 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 0018aa96..0910a5fc 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 e7abdd03..c6a97f2c 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 |