summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-05-05 10:23:40 -0400
committerFeng Pan <fpan@redhat.com>2017-05-25 23:12:57 +0000
commit07138cf271898c9c172469b79547b894a5b60b0f (patch)
treead5bde602747884dc253b73600b5dbf1120a2585 /build
parent5d52dc853acabfedf5d52130991650920832e801 (diff)
Update puppet-opendaylight git repo url
puppet-opendaylight moved from github to opendaylight.org, updating url for git clone. JIRA: APEX-455 Change-Id: I8e4a919d9c8b3dedb62c12135cc1b2741413bc34 Signed-off-by: Feng Pan <fpan@redhat.com>
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 \