Merge "Adding vsperf support"

5 files changed, 19 insertions, 1 deletions

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 6143b28d..675343db 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -74,6 +74,11 @@ pushd puppet-fdio > /dev/null
 git archive --format=tar.gz --prefix=fdio/ HEAD > ../puppet-fdio.tar.gz
 popd > /dev/null
 
+# tar up vsperf
+rm -rf vsperf vsperf.tar.gz
+git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf
+tar czf vsperf.tar.gz vsperf
+
 # installing forked opnfv-puppet-tripleo
 # enable connection tracking for protocal sctp
 # upload dpdk rpms but do not install
@@ -83,6 +88,7 @@ popd > /dev/null
 # install doctor driver ## Can be removed in Newton
 # install fd.io yum repo and packages
 # upload puppet fdio
+# git clone vsperf into the overcloud image
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
     --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \
@@ -107,6 +113,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install unzip,vpp,honeycomb \
     --upload puppet-fdio.tar.gz:/etc/puppet/modules \
     --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
+    --upload vsperf.tar.gz:/var/opt \
+    --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml
index f7312ad6..9bbbdd2b 100644
--- a/config/deploy/os-nosdn-performance-ha.yaml
+++ b/config/deploy/os-nosdn-performance-ha.yaml
@@ -8,6 +8,7 @@ deploy_options:
   congress: false
   sfc: false
   vpn: false
+  vsperf: false
   performance:
     Controller:
       kernel:
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
index 9f3ddb5e..a066e075 100644
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -198,6 +198,9 @@ Known issues
 | JIRA: APEX-86                        | Compute node count configurable      |
 |                                      | for virtual deployments              |
 +--------------------------------------+--------------------------------------+
+| JIRA: APEX-141                       | Adding VSPERF support                |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
 
 Workarounds
 -----------
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']