diff options
Diffstat (limited to 'build/overcloud-opendaylight.sh')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 4a2173d0..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 @@ -97,7 +95,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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}/networking-bgpvpn.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && yum localinstall -y *networking-bgvpn*.rpm" \ + --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" \ --upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \ @@ -106,12 +104,12 @@ 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 \ --install capnproto-devel,capnproto-libs,capnproto \ -a overcloud-full-opendaylight_build.qcow2 -mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 +LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 popd > /dev/null |