X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-opendaylight.sh;h=33d4dd1f306a43ef2072800e6ab2031fc5061a69;hb=8c86c096ab818f70215ffeb54b571ee04880242e;hp=bacf536073c3795622320540e60853b3a314946b;hpb=ac3a86983e4c049a3115c7bd77eeacaeb19d0ca3;p=apex.git

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index bacf5360..33d4dd1f 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -29,19 +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
-popd > /dev/null
-
-# cache networking-BGPVPN
-populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm
-populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm
-populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm
-populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm
-populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm
-pushd ${CACHE_DIR}/ > /dev/null
-tar czf ${BUILD_DIR}/networking-bgpvpn.tar.gz *networking-bgpvpn*
+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 gluon
@@ -58,7 +50,7 @@ popd > /dev/null
 populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz
 
 # Download ODL netvirt for VPP
-populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/odl-netvirt-vpp-distribution.tar.gz
+populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm
 
 # install ODL packages
 # Patch in OPNFV custom puppet-tripleO
@@ -70,8 +62,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 \
@@ -86,13 +79,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
     --run-command "sudo usermod -a -G quaggavt quagga" \
     --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
-    --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \
+    --upload ${CACHE_DIR}/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm:/root/ \
     -a overcloud-full-opendaylight_build.qcow2
 
-    # TODO: Put bgpvpn back into the build
-    #--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" \
-    #--run-command "touch /etc/neutron/networking_bgpvpn.conf" \
 LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
 popd > /dev/null