cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/9] git commit: updated refs/heads/master to 2ce5a0c
Date Wed, 14 Oct 2015 16:32:06 GMT
CLOUDSTACK-8947 - Avoid multiple entries in the FW_EGRESS_RULES table


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a177031
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a177031
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a177031

Branch: refs/heads/master
Commit: 4a177031b055f3649e3b4a00c80eddb5cafa1dd7
Parents: 052c0dc
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Authored: Tue Oct 13 15:50:58 2015 +0200
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Wed Oct 14 07:44:38 2015 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a177031/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index a8a7fc0..014e294 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -141,13 +141,13 @@ class CsAcl(CsDataBag):
                                     " -m %s " % rule['protocol'] +
                                     " --icmp-type %s -j %s" % (icmp_type, self.rule['action'])])
                 else:
-                    fwr = " -A FW_EGRESS_RULES" + \
-                          " -s %s " % cidr
+                    fwr = " -A FW_EGRESS_RULES"
                     if rule['protocol'] != "all":
-                        fwr += "-p %s " % rule['protocol'] + \
+                        fwr += " -s %s " % cidr + \
+                               " -p %s " % cidr, rule['protocol'] + \
                                " -m %s " % rule['protocol'] + \
                                " --dport %s" % rnge
-                    
+
                     self.fw.append(["filter", "", "%s -j %s" % (fwr, rule['action'])])
 
                 logging.debug("EGRESS rule configured for protocol ==> %s, action ==>
%s", rule['protocol'], rule['action'])


Mime
View raw message