summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-opendaylight.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 1efd2093..67131184 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -48,9 +48,11 @@ EOF
# OpenDaylight Puppet Module
rm -rf puppet-opendaylight
-git clone -b master https://github.com/dfarrell07/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.tar.gz
+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
popd > /dev/null
# cache networking-BGPVPN
@@ -93,8 +95,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "wget ${honeycomb_pkg} -O /root/fdio/${honeycomb_pkg##*/}" \
--install opendaylight,python-networking-odl \
--run-command "yum install -y /root/fdio/${honeycomb_pkg##*/}" \
- --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
- --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
+ --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}/networking-bgpvpn.tar.gz:/root/ \
--run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgpvpn*.rpm" \
--run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \