diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-28 02:14:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-28 02:14:48 +0000 |
| commit | 97b3ac02dce8786759e17008b6521dfdebdd24f9 (patch) | |
| tree | 4fa9b4d044fc92527b520e725a4ce4ca2705df2e /lib | |
| parent | 957b2c8f6569ec7454569a3767b4ee8161c092e0 (diff) | |
| parent | 6fd923895a663923f0569078eceb3818373b3e1d (diff) | |
Merge "Add support for isolcpu and VPP thread pinning"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 | ||||
| -rw-r--r-- | lib/python/apex/deploy_settings.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 96cf242d..8fe2b85f 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'] |