Merge pull request #922 from booxter/ipv6-lab-misc-fixes

Misc fixes for ipv6 lab scripts

Author: openshift-merge-bot[bot]

devsetup/scripts/ipv6-nat64/README.md

@@ -60,6 +60,8 @@ options:
 * nftables - Firewall for IPv4 NAT (Masqurade NAT64 pool behind a single ip
   address)
 
+Note: you will have to detach from the VM console by pressing `Ctrl+]`.
+
 
 sno.sh
 ------

devsetup/scripts/ipv6-nat64/nat64_router.sh

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -ex
 
 if [ "$EUID" -eq 0 ]; then
     echo "Please do not run as root."
@@ -321,7 +321,7 @@ function create_nat64_vm {
     popd
 
     echo "NAT64 router instance ${NAT64_INSTANCE_NAME} created"
-    ${VIRSH_CMD} start ${NAT64_INSTANCE_NAME}
+    ${VIRSH_CMD} start ${NAT64_INSTANCE_NAME} || true
 }
 
 function cleanup_nat64_vm {

devsetup/scripts/ipv6-nat64/network.sh

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -ex
 
 if [ "$EUID" -eq 0 ]; then
     echo "Please do not run as root."
@@ -259,7 +259,7 @@ function cleanup_firewalld_config {
         echo "firewalld.service not active, enable it or disable firewalld managment (MANAGE_FIREWALLD=false)"
         exit 1
     fi
-    sudo firewall-cmd --permanent --delete-zone=${NETWORK_NAME}
+    sudo firewall-cmd --permanent --delete-zone=${NETWORK_NAME} || true
 }
 
 function create {

devsetup/scripts/ipv6-nat64/sno.sh

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -ex
 
 if [ "$EUID" -eq 0 ]; then
     echo "Please do not run as root."
@@ -214,6 +214,7 @@ function destroy_sno_instance {
         ${VIRSH_CMD} undefine "${SNO_INSTANCE_NAME}" --nvram --remove-all-storage
         echo "OCP single-node instance: ${SNO_INSTANCE_NAME} deleted"
     fi
+    sudo virsh vol-delete --pool ${LIBVIRT_STORAGE_POOL} ${BOOTSTRAP_ISO_FILENAME} || true
 }
 
 function create_dnsmasq_config {