diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-17 03:14:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-17 03:14:17 +0000 |
| commit | 51dae541542e7434a34fc2468810c4470afe8f34 (patch) | |
| tree | a8ab190869ffee414018c3f63e688ed053475bef | |
| parent | a2e3fa60a457070c04d1e87622fd9c0cd3f75281 (diff) | |
| parent | 9cd38d64a7e2e31ab2a5919e6480377a08faeb42 (diff) | |
Merge "Removes building quagga/zrpc" into stable/danube
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/build/Makefile b/build/Makefile index 0bedd9d6..b81ddd3d 100644 --- 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 fdbb75fe..f892c712 100755 --- 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 \ |