[39/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab

[mc...@apache.org]

CLOUDSTACK-5924: Correcting regex to get vm names exactly from ebtables chains


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86124138
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86124138
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86124138

Branch: refs/heads/rbac
Commit: 86124138a1a9129dedaf0f73fcd570156bfe53f6
Parents: 202c182
Author: jayapal <ja...@apache.org>
Authored: Wed Jan 22 10:49:41 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Wed Jan 22 11:20:27 2014 +0530

----------------------------------------------------------------------
 scripts/vm/network/security_group.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86124138/scripts/vm/network/security_group.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index a7c64b0..1d94de3 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -700,7 +700,7 @@ def cleanup_rules():
                     logging.debug("vm " + vm_name + " is not running or paused, cleaning up iptable rules")
                     cleanup.append(vm_name)
 
-        chainscmd = """ebtables-save | awk '/:i/ { gsub(/(^:|-(in|out))/, "") ; print $1}'"""
+        chainscmd = """ebtables-save | awk '/:i/ { gsub(/(^:|-(in|out|ips))/, "") ; print $1}'"""
         chains = execute(chainscmd).split('\n')
         for chain in chains:
             if 1 in [ chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-'] ]: