Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E9EA717FB1 for ; Sun, 17 Jan 2016 11:56:42 +0000 (UTC) Received: (qmail 40223 invoked by uid 500); 17 Jan 2016 11:56:42 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 40135 invoked by uid 500); 17 Jan 2016 11:56:42 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 40115 invoked by uid 99); 17 Jan 2016 11:56:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jan 2016 11:56:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 22679E058E; Sun, 17 Jan 2016 11:56:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Sun, 17 Jan 2016 11:56:42 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 2afb739 Repository: cloudstack Updated Branches: refs/heads/master 1b8c464e6 -> 2afb739f0 CLOUDSTACK-9210: Pass secondary IPs to default_network_rules() function This is a mandatory argument but it was NOT passed which caused the re-programming of security groups to fail. Simple fix to just add the argument since the variable is available there. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/239148c3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/239148c3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/239148c3 Branch: refs/heads/master Commit: 239148c31bd2cb0dce19aaef63391073564d3530 Parents: ee2ccc4 Author: Wido den Hollander Authored: Tue Jan 5 18:06:34 2016 +0100 Committer: Wido den Hollander Committed: Tue Jan 5 18:06:34 2016 +0100 ---------------------------------------------------------------------- scripts/vm/network/security_group.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/239148c3/scripts/vm/network/security_group.py ---------------------------------------------------------------------- diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 4392d48..915a8af 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -818,7 +818,7 @@ def add_network_rules(vm_name, vm_id, vm_ip, signature, seqno, vmMac, rules, vif execute("iptables -F " + egress_vmchain) except: logging.debug("Error flushing iptables rules for " + vmchain + ". Presuming firewall rules deleted, re-initializing." ) - default_network_rules(vm_name, vm_id, vm_ip, vmMac, vif, brname) + default_network_rules(vm_name, vm_id, vm_ip, vmMac, vif, brname, sec_ips) egressrule = 0 for line in lines: tokens = line.split(':')