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
# 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" \
--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
| JIRA: APEX-86 | Compute node count configurable |
| | for virtual deployments |
+--------------------------------------+--------------------------------------+
+| JIRA: APEX-141 | Adding VSPERF support |
+| | |
++--------------------------------------+--------------------------------------+
Workarounds
-----------
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
'vpn',
'vpp']
-OPT_DEPLOY_SETTINGS = ['performance']
+OPT_DEPLOY_SETTINGS = ['performance', 'vsperf']
VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
VALID_PERF_OPTS = ['kernel', 'nova']