X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-full.sh;h=0984a923f1e0b0ca492482be77c8e30c35606d47;hb=16ab950af532de3f618f26ff9fbfdf4ca3244f5c;hp=1a8d846179fe3c0af4255fe82edd9e19d8efacdc;hpb=a5967c102534cfe5a12850a8e34634e997c08b03;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 1a8d8461..0984a923 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -18,6 +18,11 @@ if [ ! -d images/ ]; then mkdir images; fi
 tar -xf cache/overcloud-full.tar -C images/
 mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
 
+# Add extra space to the overcloud image
+qemu-img resize images/overcloud-full_build.qcow2 +1G
+LIBGUESTFS_BACKEND=direct virt-customize -a images/overcloud-full_build.qcow2 \
+                                         --run-command 'resize2fs /dev/sda'
+
 ##########################################################
 #####  Prep initial overcloud image with common deps #####
 ##########################################################
@@ -29,7 +34,8 @@ git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar
 popd > /dev/null
 
 # download customized os-net-config
-git clone https://github.com/trozet/os-net-config.git -b hiera_nic_mapping
+rm -fr os-net-config
+git clone https://github.com/trozet/os-net-config.git -b stable/colorado
 pushd os-net-config > /dev/null
 pushd os_net_config > /dev/null
 git archive --format=tar.gz --prefix=os_net_config/ HEAD > ../../os-net-config.tar.gz
@@ -40,24 +46,104 @@ pushd images > /dev/null
 
 dpdk_pkg_str=''
 for package in ${dpdk_rpms[@]}; do
-  curl -O "$dpdk_uri_base/$package"
+  wget "$dpdk_uri_base/$package"
   dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
 done
 
+fdio_pkg_str=''
+for package in ${fdio_pkgs[@]}; do
+  wget "$fdio_uri_base/$package"
+  fdio_pkg_str+=" --upload $package:/root/fdio"
+done
+
+# tar up the congress puppet module
+rm -rf 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
+
+# create fd.io yum repo file
+#cat > /tmp/fdio-master.repo << EOF
+#[fdio-master]
+#name=fd.io master branch latest merge
+#baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
+#enabled=1
+#gpgcheck=0
+#EOF
+
+# tar up the fd.io module
+rm -rf puppet-fdio
+git clone https://github.com/radez/puppet-fdio
+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
+# enable connection tracking for protocal sctp
+# install the congress rpms
+# upload and explode the congress puppet module
+# 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" \
+    --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
+    --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
     --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     --run-command "mkdir /root/dpdk_rpms" \
+    --run-command "mkdir /root/fdio" \
     $dpdk_pkg_str \
+    $fdio_pkg_str \
+    --upload ../networking-vpp.noarch.rpm:/root/fdio \
+    --run-command "yum install -y etcd" \
+    --run-command "pip install python-etcd" \
     --install "centos-release-qemu-ev" \
     --run-command "yum update -y" \
     --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" \
+    --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" \
+    --run-command "yum install -y /root/fdio/*.rpm" \
+    --run-command "tar zxvf /root/fdio/vpp_papi*.tar.gz -C /" \
+    --install unzip \
+    --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