summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-12-01 19:49:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-01 19:49:37 +0000
commitbdc8b51164dff9f47be11bbd7a5cbf9789068489 (patch)
tree5d1556122fa9ce6f602f30b688143c908faaa6c0 /build
parent20986cfd6a55a98e3e9994aeaca7c5390463c4b3 (diff)
parent20accc70e41ac4a533fe65868438bd099196f492 (diff)
Merge "Updates FD.IO ODL scenarios to use Carbon ODL version" into stable/colorado
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 377a9a93..a23d57d3 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 \