summaryrefslogtreecommitdiffstats
path: root/build/overcloud-opendaylight.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-08-15 03:30:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-15 03:30:58 +0000
commit16821de4807132ab784926e21059d793e36667ce (patch)
treefdb33606710601efaeabcb59dd6f52062ce035e4 /build/overcloud-opendaylight.sh
parent12e2bf17f56d7a83b2779468e543857550f9f68a (diff)
parent7d9495aec0340d743bf0e59db5b7360bef013004 (diff)
Merge "Fixes OpenDaylight version"
Diffstat (limited to 'build/overcloud-opendaylight.sh')
-rwxr-xr-xbuild/overcloud-opendaylight.sh21
1 files changed, 16 insertions, 5 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index ae5764c2..775fcbfb 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -27,13 +27,21 @@ enabled=1
gpgcheck=0
EOF
+cat > ${BUILD_DIR}/opendaylight_nitrogen.repo << EOF
+[opendaylight-7-release]
+name=CentOS CBS OpenDaylight Nitrogen repository
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-7-testing/\$basearch/os/
+enabled=1
+gpgcheck=0
+EOF
+
# OpenDaylight Puppet Module
rm -rf puppet-opendaylight
git clone -b stable/carbon https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight
pushd puppet-opendaylight > /dev/null
git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz
-git checkout stable/boron
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-boron.tar.gz
+git checkout master
+git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz
popd > /dev/null
# cache gluon
@@ -55,11 +63,14 @@ populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-
# install quagga/zrpc
# upload neutron patch for generic NS linux interface driver + OVS for external networks
LIBGUESTFS_BACKEND=direct virt-customize \
+ --upload ${BUILD_DIR}/opendaylight_nitrogen.repo:/etc/yum.repos.d/opendaylight.repo \
+ --run-command "mkdir -p /root/nitrogen" \
+ --run-command "yum install --downloadonly --downloaddir=/root/nitrogen opendaylight" \
--upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
--install opendaylight,python-networking-odl \
- --upload ${BUILD_DIR}/puppet-opendaylight-boron.tar.gz:/etc/puppet/modules/ \
- --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-boron.tar.gz" \
- --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/root/ \
+ --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/etc/puppet/modules/ \
+ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-carbon.tar.gz" \
+ --upload ${BUILD_DIR}/puppet-opendaylight-master.tar.gz:/root/ \
--upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \
--install python-click \