@@ -221,7 +221,10 @@ function cleanup_nova {

         instances=`sudo virsh list --all | grep $INSTANCE_NAME_PREFIX | sed "s/.*\($INSTANCE_NAME_PREFIX[0-9a-fA-F]*\).*/\1/g"`

         if [ ! "$instances" = "" ]; then

             echo $instances | xargs -n1 sudo virsh destroy || true

-            echo $instances | xargs -n1 sudo virsh undefine --managed-save || true

+            if ! xargs -n1 sudo virsh undefine --managed-save --nvram <<< $instances; then

+                # Can't delete with nvram flags, then just try without this flag

+                xargs -n1 sudo virsh undefine --managed-save <<< $instances

+            fi

         fi

         # Logout and delete iscsi sessions