summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-26 12:56:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-26 12:56:45 +0000
commita1387030f8c54b441fad620712d119359d0e6e24 (patch)
treed6cfb49ecefe8f0f54b09b973196716b5c908d67 /build
parent8a973df23bf27f14c601100b63fa9f8ccbee0b76 (diff)
parent07138cf271898c9c172469b79547b894a5b60b0f (diff)
Merge "Update puppet-opendaylight git repo url"
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 35d9bac3..fccfb2e4 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -29,9 +29,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
@@ -70,8 +72,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "curl -L https://nexus.fd.io/content/repositories/fd.io.stable.1704.centos7/io/fd/hc2vpp/honeycomb/1.17.04-2048.noarch/honeycomb-1.17.04-2048.noarch.rpm > /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
--install opendaylight,python-networking-odl \
--run-command "yum install -y /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
- --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}/puppet-gluon.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \
--install epel-release \