diff options
| -rwxr-xr-x | build/instack.sh | 10 | ||||
| -rwxr-xr-x | ci/clean.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build/instack.sh b/build/instack.sh index 682d1b26..164c6f79 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -269,14 +269,14 @@ LIBGUESTFS_BACKEND=direct virt-customize \ ############################################### cat > /tmp/opendaylight.repo << EOF -[opendaylight] -name=OpenDaylight \$releasever - \$basearch -baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/\$basearch/os/ +[opendaylight-41-release] +name=CentOS CBS OpenDaylight Beryllium SR1 repository +baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-41-release/\$basearch/os/ enabled=1 gpgcheck=0 EOF -odlrpm=opendaylight-4.0.0-1.rc3.1.el7.noarch.rpm +odlrpm=opendaylight-4.1.0-1.el7.noarch.rpm LIBGUESTFS_BACKEND=direct virt-customize --upload ${rdo_images_uri/file:\/\//}/$odlrpm:/tmp/ \ -a overcloud-full-opendaylight.qcow2 opendaylight=/tmp/$odlrpm @@ -292,7 +292,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ # upload the opendaylight puppet module rm -rf puppet-opendaylight -cp ${rdo_images_uri/file:\/\//}/puppet-opendaylight-3.2.2.tar.gz puppet-opendaylight.tar.gz +cp ${rdo_images_uri/file:\/\//}/puppet-opendaylight-3.5.0.tar.gz puppet-opendaylight.tar.gz LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ --upload ../opendaylight-puppet-neutron.patch:/tmp \ diff --git a/ci/clean.sh b/ci/clean.sh index f05b9136..4eafba0e 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -20,7 +20,7 @@ vm_index=4 ovs_bridges="brbm brbm1 brbm2 brbm3" # Clean off instack VM virsh destroy instack 2> /dev/null || echo -n '' -virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' +virsh undefine instack 2> /dev/null || echo -n '' if ! virsh vol-delete instack.qcow2 --pool default 2> /dev/null; then if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then /usr/bin/touch /var/lib/libvirt/images/instack.qcow2 @@ -33,7 +33,7 @@ rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null # Clean off baremetal VMs in case they exist for i in $(seq 0 $vm_index); do virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n '' - virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i --remove-all-storage 2> /dev/null || echo -n '' + virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n '' /usr/bin/touch /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null |