commit de3f46738fa5d3cdf659800cef4041a94829abf0
author Andy Bavier <acb@cs.princeton.edu> Wed Jun 01 17:02:42 2016 -0400
committer Andy Bavier <acb@cs.princeton.edu> Wed Jun 01 17:02:42 2016 -0400
tree 49d501b5595b172e5bc6a52d5fd95a4d9ac7e525
parent 9927f96fe84d5be41a276b3ef48a369c6e6304cb

Make repeated runs more robust

scripts/single-node-pod.sh

diff --git a/scripts/single-node-pod.sh b/scripts/single-node-pod.sh
index e610bdf..c3f06ab 100755
--- a/scripts/single-node-pod.sh
+++ b/scripts/single-node-pod.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function cleanup_from_previous_test() {
-    VMS=$( sudo virsh list|grep running|awk '{print $2}' )
+    VMS=$( sudo uvt-kvm list )
     for VM in $VMS
     do
       sudo uvt-kvm destroy $VM
@@ -11,8 +11,11 @@
     rm -f ~/.ssh/known_hosts
     rm -rf ~/openstack-cluster-setup
 
-    sudo rm -f /var/lib/libvirt/dnsmasq/default.leases
-    sudo killall -HUP dnsmasq
+    # Attempt to flush out old leases from dnsmasq, for repeated runs
+    sudo cp /var/lib/libvirt/dnsmasq/default.leases /var/lib/libvirt/dnsmasq/default.leases.bak
+    sudo truncate -s 0 /var/lib/libvirt/dnsmasq/default.leases
+    sudo killall dnsmasq
+    sudo /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf
 }
 
 function bootstrap() {