commit 0bd0a1db4dcd4eee07c8dd8819ba164f2e9fc5b2
author Andy Bavier <acb@cs.princeton.edu> Fri Oct 23 15:59:35 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Fri Oct 23 15:59:35 2015 -0400
tree 66ebcc18e812710ebe8518dea5c2e43ae609510e
parent 62637f29c8c22b0015b58b1b947b296a988fdeca
parent 2622d4e24bd8d2e7d31b9bfef878e2914e54f97c

Merge branch 'hotfix/virbr0-broken'

cloudlab-setup.yml

diff --git a/cloudlab-setup.yml b/cloudlab-setup.yml
index 65d5283..da9d9a6 100644
--- a/cloudlab-setup.yml
+++ b/cloudlab-setup.yml
@@ -73,7 +73,7 @@
 
   handlers:
   - name: recreate default net
-    shell: virsh net-destroy default; virsh net-create /etc/libvirt/qemu/networks/default.xml
+    script: scripts/recreate-virbr0.sh
 
 # Play: create VMs to host OpenStack services
 - hosts: head

scripts/recreate-virbr0.sh

diff --git a/scripts/recreate-virbr0.sh b/scripts/recreate-virbr0.sh
new file mode 100644
index 0000000..d38a6d5
--- /dev/null
+++ b/scripts/recreate-virbr0.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+FILE=/etc/libvirt/qemu/networks/default.xml
+
+cp $FILE $FILE.tmp
+virsh net-destroy default
+virsh net-undefine default
+
+cp $FILE.tmp $FILE
+virsh net-create $FILE