Merge "Removes building quagga/zrpc" into stable/danube

diff --git a/build/Makefile b/build/Makefile
index 0bedd9d..b81ddd3 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -248,7 +248,7 @@ $(BUILD_DIR)/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm
 ###############
 
 .PHONY: overcloud-opendaylight
-overcloud-opendaylight: quagga-zrpc $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
+overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2
 
 $(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2
        @echo "Building the Apex OpenDaylight Overcloud Image"

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index fdbb75f..f892c71 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -73,10 +73,8 @@ pushd netready/ > /dev/null
 git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz
 popd > /dev/null
 
-# Tar up all quagga/zrpc rpms
-pushd ${QUAGGA_RPMS_DIR}/rpmbuild/RPMS > /dev/null
-tar --transform "s/^x86_64/quagga/" -czvf ${BUILD_DIR}/quagga.tar.gz x86_64/
-popd > /dev/null
+# Download quagga/zrpc rpms
+populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga.tar.gz
 
 # install ODL packages
 # Patch in OPNFV custom puppet-tripleO
@@ -106,7 +104,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install python-click \
     --upload ${CACHE_DIR}/$gluon_rpm:/root/\
     --install /root/$gluon_rpm \
-    --upload ${BUILD_DIR}/quagga.tar.gz:/root/ \
+    --upload ${CACHE_DIR}/quagga.tar.gz:/root/ \
     --run-command "cd /root/ && tar xzf quagga.tar.gz" \
     --run-command "yum downgrade -y python-zmq-14.3.1" \
     --install zeromq-4.1.4,zeromq-devel-4.1.4 \