summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-18 19:37:33 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-18 19:37:33 +0000
commit9f7c8cc97bb73069455b5357c0d4c0dcfc26d5a3 (patch)
tree8e6670349025d5669b2889b0146cfdb6902b5ccc /build
parentacb50b19e29c991d314fbde9116ac5f08e2ce852 (diff)
parente415d7b2a2a9349ca2e7c8b8d3fbaa5d4e7dcb57 (diff)
Merge "Adding vsperf support"
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-full.sh8
1 files changed, 8 insertions, 0 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