diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-05-26 14:39:02 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-05-26 14:47:28 -0400 |
| commit | 0a78a0e5da0e9db70188340d7d3ffa283bfe7b6b (patch) | |
| tree | bad37b95dd83787a47527285e25ed67adb57e9a2 /build/overcloud-opendaylight.sh | |
| parent | e02b5be4ef2af55af0243dcd19ffac74fa7a052e (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/overcloud-opendaylight.sh')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 11 |
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" \ |