From a76fae7b6eadcffcbd40e39c5d75160d7d215f5d Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 27 Oct 2016 22:25:31 -0400 Subject: Add support for isolcpu and VPP thread pinning Also depend on https://github.com/radez/puppet-fdio/pull/14 JIRA: APEX-337 opnfv-tht-pr: 92 Change-Id: Ic3d2f04bfd1983c38e09a2bfa3992a572fc9c6c1 Signed-off-by: Feng Pan (cherry picked from commit 6fd923895a663923f0569078eceb3818373b3e1d) --- lib/overcloud-deploy-functions.sh | 4 ++++ lib/python/apex/deploy_env.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index ee89aef3..f23390b7 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -199,6 +199,10 @@ if [ -n "${public_network_controller_interface}" ]; then fi EOI + echo -e "${blue}INFO: Including /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml ${reset}" + if [ "$debug" == 'TRUE' ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "cat /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml" + fi DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml" fi diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py index 816dc114..10b7831f 100644 --- a/lib/python/apex/deploy_env.py +++ b/lib/python/apex/deploy_env.py @@ -24,7 +24,7 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', OPT_DEPLOY_SETTINGS = ['performance', 'vsperf'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] -VALID_PERF_OPTS = ['kernel', 'nova'] +VALID_PERF_OPTS = ['kernel', 'nova', 'vpp'] VALID_DATAPLANES = ['ovs', 'ovs_dpdk', 'fdio'] -- cgit 1.2.3-korg