You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:48 UTC
[46/50] git commit: updated refs/heads/master to 3c429ee
Fixed password server respawning issue
Some changes to isolated network acl generation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6fc680be
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6fc680be
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6fc680be
Branch: refs/heads/master
Commit: 6fc680be71adeec9bc33b8f6e571193ca42b5f14
Parents: 5ddf87b
Author: Ian Southam <is...@schubergphilis.com>
Authored: Thu Mar 5 11:48:27 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Mar 16 11:40:11 2015 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 4 ++--
systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py | 2 +-
.../patches/debian/config/opt/cloud/bin/cs_firewallrules.py | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fc680be/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index 8f4d511..f675a655 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -307,10 +307,10 @@ class CsIP:
if self.get_type() in ["public"]:
self.fw.append(["mangle", "front",
"-A PREROUTING " +
- "-d %s -j VPN_%s" % (self.address['network'], self.address['public_ip'])])
+ "-d %s/32 -j VPN_%s" % (self.address['public_ip'], self.address['public_ip'])])
self.fw.append(["mangle", "front",
"-A PREROUTING " +
- "-d %s -j FIREWALL_%s" % (self.address['network'], self.address['public_ip'])])
+ "-d %s/32 -j FIREWALL_%s" % (self.address['public_ip'], self.address['public_ip'])])
self.fw.append(["mangle", "front",
"-A FIREWALL_%s " % self.address['public_ip'] +
"-m state --state RELATED,ESTABLISHED -j ACCEPT"])
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fc680be/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
index cceb464..de53fe0 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py
@@ -69,7 +69,7 @@ class CsPasswdSvc():
def start(self):
proc = CsProcess(["dummy"])
- if proc.grep("passwd_service %s" % self.ip) == -1:
+ if proc.grep("passwd_server_ip %s" % self.ip) == -1:
proc.start("/opt/cloud/bin/passwd_server_ip %s >> /var/log/cloud.log 2>&1" % self.ip, "&")
def stop(self):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fc680be/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py b/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py
index 0cef723..d617a09 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py
@@ -18,15 +18,15 @@
from pprint import pprint
import copy
-
def merge(dbag, data):
dbagc = copy.deepcopy(dbag)
if "rules" not in data:
- return dbagc
+ return dbagc
for rule in data['rules']:
id = str(rule['id'])
if rule['revoked']:
- del(dbagc[id])
- if id not in dbagc.keys():
+ if id in dbagc.keys():
+ del(dbagc[id])
+ elif id not in dbagc.keys():
dbagc[id] = rule
return dbagc