Updates FD.IO ODL scenarios to use Carbon ODL version

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

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 65f9c06..4152c19 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -43,6 +43,15 @@ enabled=1
 gpgcheck=0
 EOF
 
+# Master Repo
+cat > /tmp/opendaylight_master.repo << EOF
+[opendaylight-6-release]
+name=CentOS CBS OpenDaylight Carbon repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-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
 
@@ -55,13 +64,14 @@ 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_master.repo:/etc/yum.repos.d/opendaylight.repo \
+    --run-command "yum install --downloadonly --downloaddir=/root/master/ 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-1.0.0-99.noarch.rpm:/root/ \
-    --run-command "yum -y install /root/honeycomb-1.0.0-99.noarch.rpm" \
+    --install honeycomb \
     --upload ./setup_TEPs.py:/tmp \
     -a overcloud-full-opendaylight_build.qcow2
 
@@ -74,7 +84,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 
 # upload the opendaylight puppet module
 rm -rf puppet-opendaylight
-git clone -b opnfv_integration https://github.com/dfarrell07/puppet-opendaylight
+git clone -b master https://github.com/dfarrell07/puppet-opendaylight
 pushd puppet-opendaylight > /dev/null
 git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
 popd > /dev/null