From f8cad77afaee9f9754a0749ab2bdeeeaab70a1b1 Mon Sep 17 00:00:00 2001 From: anthony Date: Sat, 1 Sep 2012 10:23:49 -0700 Subject: [PATCH] CS-16261: egress_vmchain doesn't exist in 2.2.*, create it automatically after upgrade reviewed-by: kelven --- scripts/vm/hypervisor/xenserver/vmops | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 3102a6eb979..b33020dc715 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -1402,11 +1402,21 @@ def network_rules(session, args): cmds.append(iptables) util.SMlog(iptables) - vmchain = chain_name(vm_name) - util.pread2(['iptables', '-F', vmchain]) - egress_vmchain = egress_chain_name(vm_name) - util.pread2(['iptables', '-F', egress_vmchain]) - + vmchain = chain_name(vm_name) + try: + util.pread2(['iptables', '-F', vmchain]) + except: + util.SMlog("Ignoring failure to delete chain " + vmchain) + util.pread2(['iptables', '-N', vmchain]) + + egress_vmchain = egress_chain_name(vm_name) + try: + util.pread2(['iptables', '-F', egress_vmchain]) + except: + util.SMlog("Ignoring failure to delete chain " + egress_vmchain) + util.pread2(['iptables', '-N', egress_vmchain]) + + for cmd in cmds: util.pread2(cmd)