diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-18 19:37:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-18 19:37:33 +0000 |
| commit | 9f7c8cc97bb73069455b5357c0d4c0dcfc26d5a3 (patch) | |
| tree | 8e6670349025d5669b2889b0146cfdb6902b5ccc /lib | |
| parent | acb50b19e29c991d314fbde9116ac5f08e2ce852 (diff) | |
| parent | e415d7b2a2a9349ca2e7c8b8d3fbaa5d4e7dcb57 (diff) | |
Merge "Adding vsperf support"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/post-install-functions.sh | 6 | ||||
| -rw-r--r-- | lib/python/apex/deploy_env.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 23c83361..ec2ca89f 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -131,6 +131,12 @@ done EOI fi + ### VSPERF ### + if [[ "${deploy_options_array['vsperf']}" == 'True' ]]; then + echo "${blue}\nVSPERF enabled, running build_base_machine.sh\n${reset}" + overcloud_connect "compute0" "sudo sh -c 'cd /var/opt/vsperf/systems/ && ./build_base_machine.sh 2>&1 > /var/log/vsperf.log'" + fi + # Collect deployment logs ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI mkdir -p ~/deploy_logs diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py index 1fe137e4..816dc114 100644 --- a/lib/python/apex/deploy_env.py +++ b/lib/python/apex/deploy_env.py @@ -21,7 +21,7 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', 'vpn', 'vpp'] -OPT_DEPLOY_SETTINGS = ['performance'] +OPT_DEPLOY_SETTINGS = ['performance', 'vsperf'] VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage'] VALID_PERF_OPTS = ['kernel', 'nova'] |