From 6fd923895a663923f0569078eceb3818373b3e1d Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Tue, 25 Oct 2016 19:07:37 -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 <fpan@redhat.com>
---
lib/overcloud-deploy-functions.sh | 4 ++++
lib/python/apex/deploy_settings.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 a42162f2..a62b00ff 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_settings.py b/lib/python/apex/deploy_settings.py
index c27eecf9..5490c6e9 100644
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.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