etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
wilderrodrigues 2015-01-05 15:18:51 +01:00
parent 33b0ce816b
commit 35151961be
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
systemvm/patches/debian/config/opt/cloud/bin/configure.py
View File

@ -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']

7
systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ
View File

@ -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"
}