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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5f83ac8c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5f83ac8c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5f83ac8c Branch: refs/heads/feature/systemvm-persistent-config Commit: 5f83ac8c0eea195e7046d8eef8aa2af6fdd5d499 Parents: 8be5bde Author: wilderrodrigues <[email protected]> Authored: Mon Jan 5 15:18:51 2015 +0100 Committer: wilderrodrigues <[email protected]> Committed: Wed Feb 4 18:47:04 2015 +0100 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/configure.py | 3 ++- .../debian/config/opt/cloud/templates/keepalived.conf.templ | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f83ac8c/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 c2f8bb1..4031c55 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'] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f83ac8c/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ ---------------------------------------------------------------------- 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 1e75070..81acc7a 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" }
