git commit: updated refs/heads/4.3 to 9b33deb

[se...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/4.3 f16fbc3c5 -> 9b33deb62


CLOUDSTACK-6927: Allow virtual router to be correctly cleaned from iptables

Virtual router never get a "-def" definition in iptables


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

Branch: refs/heads/4.3
Commit: 9b33deb622be3c9a1d41ed3bad3ae1ad2e092dbc
Parents: f16fbc3
Author: Loic Lambiel <ma...@speedswiss.ch>
Authored: Fri May 30 16:16:30 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Tue Jun 17 17:02:56 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b33deb6/scripts/vm/network/security_group.py
----------------------------------------------------------------------
diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index 704b279..8a946bc 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -538,7 +538,7 @@ def post_default_network_rules(vm_name, vm_id, vm_ip, vm_mac, vif, brname, dhcpS
             logging.debug("Failed to log default network rules, ignoring")
 def delete_rules_for_vm_in_bridge_firewall_chain(vmName):
     vm_name = vmName
-    if vm_name.startswith('i-') or vm_name.startswith('r-'):
+    if vm_name.startswith('i-'):
 	vm_name = '-'.join(vm_name.split('-')[:-1]) + "-def"
 
     vmchain = vm_name