cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 2afb739
Date Sun, 17 Jan 2016 11:56:42 GMT
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 <wido@widodh.nl>
Authored: Tue Jan 5 18:06:34 2016 +0100
Committer: Wido den Hollander <wido@widodh.nl>
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(':')


Mime
View raw message