From 35151961becb8cc3ad3edea8d658974551add22c Mon Sep 17 00:00:00 2001 From: wilderrodrigues Date: Mon, 5 Jan 2015 15:18:51 +0100 Subject: [PATCH] Fixing call on AclIP class. Instead of self.fw = fw we have to do self.fw = fw.get_fw() Fixing the master.py path in the keepalived.conf.templ --- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 3 ++- .../config/opt/cloud/templates/keepalived.conf.templ | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index c2f8bb1098f..4031c556efd 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py @@ -71,7 +71,7 @@ class CsAcl(CsDataBag): """ For type Virtual Router """ def __init__(self, obj, fw): - self.fw = fw + self.fw = fw.get_fw() self.direction = 'egress' if obj['traffic_type'] == 'Ingress': self.direction = 'ingress' @@ -173,6 +173,7 @@ class CsAcl(CsDataBag): def init_vpc(self, direction, acl, rule, config): self.table = "" self.device = acl.device + # acl is an object of the AclDevice type. So, its fw attribute is already a list. self.fw = acl.fw self.chain = config.get_ingress_chain(self.device, acl.ip) self.dest = "-s %s" % rule['cidr'] diff --git a/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ b/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ index 1e75070ca9c..81acc7a1395 100644 --- a/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ +++ b/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ @@ -51,7 +51,8 @@ vrrp_instance inside_network { heartbeat } - notify_master "/opt/cloud/bin/master.py --master" - notify_backup "/opt/cloud/bin/master.py --backup" - notify_fault "/opt/cloud/bin/master.py --fault" + !That's the correct path of the master.py file. + notify_master "/cloud_scripts/opt/cloud/bin/master.py --master" + notify_backup "/cloud_scripts/opt/cloud/bin/master.py --backup" + notify_fault "/cloud_scripts/opt/cloud/bin/master.py --fault" }