summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-11-28 15:38:50 -0500
committerTim Rozet <trozet@redhat.com>2016-12-01 09:44:02 -0500
commit20accc70e41ac4a533fe65868438bd099196f492 (patch)
treee271c1818515289d9d59ae50843ece8c6526b630 /build
parent916ff520b1626ae8cd4f93ccc55080164dcee9fa (diff)
Updates FD.IO ODL scenarios to use Carbon ODL version
JIRA: APEX-346 Change-Id: I9ffa32da906f50441dfc05610d0668e84c992e81 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit af3976a683b8bdfd6a16d599940c2aa8dea3a077)
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-opendaylight.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 377a9a9..a23d57d 100755
--- 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,6 +64,8 @@ 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 \