mgr/rook: handle inactive libvirt default network in recreate_default_network

net-destroy fails if the network exists but is already inactive, causing
the script to exit before net-define is attempted. Check for this case
and fall through to net-undefine directly so the network can be cleanly
recreated regardless of its initial state.

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh b/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh
index 0005e3f23f6193d5478e223857833a6e6b6e9a77..c8b56ccfb5482cfe5beef2c1123de9791e3cdf89 100755 (executable)
--- a/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh
+++ b/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh
@@ -152,9 +152,12 @@ configure_libvirt(){
 
 recreate_default_network(){
 
-    # destroy any existing kvm default network
-    if sudo virsh net-destroy default; then
-       sudo virsh net-undefine default
+    # destroy and undefine any existing default network, active or not
+    if sudo virsh net-destroy default 2>/dev/null; then
+        sudo virsh net-undefine default
+    elif sudo virsh net-info default &>/dev/null; then
+        # network exists but is already inactive, just undefine it
+        sudo virsh net-undefine default
     fi
 
     # let's create a new kvm default network