From 6fc680be71adeec9bc33b8f6e571193ca42b5f14 Mon Sep 17 00:00:00 2001 From: Ian Southam Date: Thu, 5 Mar 2015 11:48:27 +0100 Subject: [PATCH] Fixed password server respawning issue Some changes to isolated network acl generation --- .../patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 4 ++-- systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py | 2 +- .../debian/config/opt/cloud/bin/cs_firewallrules.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) 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 8f4d5117c10..f675a6554cd 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"]) 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 cceb4647976..de53fe0f342 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): 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 0cef7234c94..d617a09f761 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