Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 82F47D4C7 for ; Sat, 8 Sep 2012 00:06:36 +0000 (UTC) Received: (qmail 98774 invoked by uid 500); 8 Sep 2012 00:06:36 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 98747 invoked by uid 500); 8 Sep 2012 00:06:36 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 98739 invoked by uid 99); 8 Sep 2012 00:06:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Sep 2012 00:06:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A5E3284D4; Sat, 8 Sep 2012 00:06:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CS-16261: egress_vmchain doesn't exist in 2.2.*, create it automatically after upgrade Message-Id: <20120908000636.2A5E3284D4@tyr.zones.apache.org> Date: Sat, 8 Sep 2012 00:06:36 +0000 (UTC) Updated Branches: refs/heads/master 3cfe01d07 -> 33fdcf104 CS-16261: egress_vmchain doesn't exist in 2.2.*, create it automatically after upgrade Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/33fdcf10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/33fdcf10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/33fdcf10 Branch: refs/heads/master Commit: 33fdcf104782fc9f0b0ff402d77d013811dfa4ce Parents: 3cfe01d Author: Anthony Xu Authored: Fri Sep 7 17:07:10 2012 -0700 Committer: Anthony Xu Committed: Fri Sep 7 17:07:10 2012 -0700 ---------------------------------------------------------------------- scripts/vm/hypervisor/xenserver/vmops | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/33fdcf10/scripts/vm/hypervisor/xenserver/vmops ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index ed7e7ca..79b67e7 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)