From 33fdcf104782fc9f0b0ff402d77d013811dfa4ce Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Fri, 7 Sep 2012 17:07:10 -0700 Subject: [PATCH] CS-16261: egress_vmchain doesn't exist in 2.2.*, create it automatically after upgrade --- scripts/vm/hypervisor/xenserver/vmops | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index ed7e7ca8450..79b67e71380 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -1380,10 +1380,20 @@ 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)