etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8380: default chains weren't getting deleted

This commit is contained in:
Chiradeep Vittal 2011-02-04 12:04:43 -08:00
parent 97af1c82aa
commit 4f1342a4dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/vm/hypervisor/xenserver/vmops
View File

@ -675,7 +675,7 @@ def delete_rules_for_vm_in_bridge_firewall_chain(vmName):
vm_name = vmName
vmchain = vm_name
if vm_name.startswith('i-') or vm_name.startswith('r-'):
vmchain = '-'.join(vm_name.split('-')[:-1])
vmchain = '-'.join(vm_name.split('-')[:-2])
delcmd = "iptables -S BRIDGE-FIREWALL | grep " + vmchain + " | sed 's/-A/-D/'"
delcmds = util.pread2(['/bin/bash', '-c', delcmd]).split('\n')
@ -832,7 +832,7 @@ def cleanup_rules_for_dead_vms(session):
@echo
def cleanup_rules(session, args):
try:
chainscmd = "iptables-save | grep '^:' | grep -v '.*-def' | awk '{print $1}' | cut -d':' -f2"
chainscmd = "iptables-save | grep '^:' | awk '{print $1}' | cut -d':' -f2 | sed 's/-def/-VM/'|sort|uniq"
chains = util.pread2(['/bin/bash', '-c', chainscmd]).split('\n')
cleaned = 0
cleanup = []