Fixes disk space issue with perf scenarios on Undercloud

[apex.git] / build / overcloud-opendaylight.sh

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 7e6c820..af65910 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -18,27 +18,58 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
 #####    Adding OpenDaylight to overcloud #####
 ###############################################
 
+# tar up fdio networking-odl
+rm -rf fds
+git clone https://gerrit.opnfv.org/gerrit/fds
+pushd fds > /dev/null
+tar -czvf ../networking-odl.tar.gz networking-odl
+popd > /dev/null
+
+# Beryllium Repo
 cat > /tmp/opendaylight.repo << EOF
-[opendaylight]
-name=OpenDaylight \$releasever - \$basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-40-release/\$basearch/os/
+[opendaylight-4-release]
+name=CentOS CBS OpenDaylight Beryllium repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-release/\$basearch/os/
+enabled=1
+gpgcheck=0
+EOF
+
+# Boron Repo
+cat > /tmp/opendaylight_boron.repo << EOF
+[opendaylight-5-release]
+name=CentOS CBS OpenDaylight Boron repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-5-testing/\$basearch/os/
 enabled=1
 gpgcheck=0
 EOF
 
+# SDNVPN - Copy tunnel setup script
+wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
+
+# Honeycomb RPM
+wget $fdio_uri_base/$honeycomb_pkg
+
 # install ODL packages
-# patch puppet-neutron: ODL Bug, Url check reports ODL is up but it's not quite up
+# install Jolokia for ODL HA
+# Patch in OPNFV custom puppet-tripleO
+# install Honeycomb
 LIBGUESTFS_BACKEND=direct virt-customize \
+    --upload networking-odl.tar.gz:/root/ \
+    --upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
+    --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
     --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
     --install opendaylight,python-networking-odl \
     --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
+    --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
+    --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
+    --upload $honeycomb_pkg:/root/ \
+    --run-command "yum -y install /root/$honeycomb_pkg" \
+    --upload ./setup_TEPs.py:/tmp \
     -a overcloud-full-opendaylight_build.qcow2
 
-# install Jolokia for ODL HA
-LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload ${odl_artifacts_cache}/jolokia.tar.gz:/tmp/ \
-    --run-command "tar -xvf /tmp/jolokia.tar.gz -C /opt/opendaylight/system/org" \
-    -a overcloud-full-opendaylight_build.qcow2
+    # Move these two lines above the -a overcloud-full-opendaylight_build.qcow2 when the patch has been rebased
+    #--upload ../opnfv-puppet-tripleo.patch:/tmp \
+    #--run-command "cd /etc/puppet/modules/tripleo && patch -Np1 < /tmp/opnfv-puppet-tripleo.patch" \
 
 ## WORK AROUND
 ## when OpenDaylight lands in upstream RDO manager this can be removed