nuke: clear test firewall rules

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 6f4513484773d71f34c8a312d0f953e1f7759381..df549412ec7b4c3d0ba8364447c800a8ca50c612 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -24,6 +24,19 @@ from .task.internal import connect
 log = logging.getLogger(__name__)
 
 
+def clear_firewall(ctx):
+    """
+    Remove any iptables rules created by teuthology.  These rules are identified by containing
+    a comment with 'teuthology' in it.  Non-teuthology firewall rules are unaffected.
+    """
+    ctx.cluster.run(
+        args=[
+            "sudo", "sh", "-c", "iptables-save | grep -v teuthology | iptables-restore"
+        ],
+        wait=False,
+    )
+
+
 def shutdown_daemons(ctx):
     nodes = {}
     for remote in ctx.cluster.remotes.iterkeys():
@@ -420,6 +433,10 @@ def nuke_helper(ctx, should_unlock):
         check_lock(ctx, None)
     connect(ctx, None)
 
+    log.info("Clearing teuthology firewall rules...")
+    clear_firewall(ctx)
+    log.info("Cleared teuthology firewall rules.")
+
     log.info('Unmount ceph-fuse and killing daemons...')
     shutdown_daemons(ctx)
     log.info('All daemons killed.')