X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-full.sh;h=98a0477bd15d105b764ea74a625539ef00238a4c;hb=refs%2Fchanges%2F57%2F18757%2F3;hp=6143b28d6d724d566ed2b604c6ff5372edd3aa42;hpb=ddecb36accd3f229ccee6113ee04b9e623885203;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 6143b28d..98a0477b 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -13,7 +13,6 @@ source ./variables.sh
 source ./functions.sh
 
 populate_cache "$rdo_images_uri/overcloud-full.tar"
-populate_cache "$openstack_congress"
 
 if [ ! -d images/ ]; then mkdir images; fi
 tar -xf cache/overcloud-full.tar -C images/
@@ -53,7 +52,7 @@ done
 
 # tar up the congress puppet module
 rm -rf puppet-congress
-git clone https://github.com/radez/puppet-congress
+git clone -b stable/mitaka https://github.com/radez/puppet-congress
 pushd puppet-congress > /dev/null
 git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz
 popd > /dev/null
@@ -74,6 +73,19 @@ 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
+
+# tar up the tacker puppet module
+rm -rf puppet-tacker
+# TODO move this back to radez puppet-tacker after PR is accepted
+git clone -b fix_db_sync https://github.com/trozet/puppet-tacker
+pushd puppet-tacker > /dev/null
+git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz
+popd > /dev/null
+
 # installing forked opnfv-puppet-tripleo
 # enable connection tracking for protocal sctp
 # upload dpdk rpms but do not install
@@ -83,6 +95,8 @@ 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
+# upload the tacker puppet module and untar it
 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" \
@@ -97,16 +111,31 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum remove -y qemu-system-x86" \
     --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
     --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \
-    --install "$openstack_congress" \
+    --upload ../noarch/openstack-congress-2016.1-1.el7.centos.noarch.rpm:/root/ \
+    --install /root/openstack-congress-2016.1-1.el7.centos.noarch.rpm \
     --install "python2-congressclient" \
     --upload puppet-congress.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
     --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
     --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
     --upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \
-    --install unzip,vpp,honeycomb \
+    --upload ../vpp-bin.tar.gz:/root \
+    --run-command "cd /root && tar zxvf vpp-bin.tar.gz" \
+    --run-command "yum install -y /root/vpp-bin/*.rpm" \
+    --run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \
+    --install unzip,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" \
+    --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
+    --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \
+    --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
+    --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
+    --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \
+    --run-command "pip install python-senlinclient" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2