Commit de04b523 authored by Łukasz Nowak's avatar Łukasz Nowak

- expose zeo configuration in connection dict


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44120 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ecb7270c
...@@ -111,8 +111,8 @@ class Recipe(BaseSlapRecipe): ...@@ -111,8 +111,8 @@ class Recipe(BaseSlapRecipe):
'login_node_amount' in self.parameter_dict: 'login_node_amount' in self.parameter_dict:
self.installZeo() self.installZeo()
common_kw = dict( common_kw = dict(
zeo_address='%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']), zeo_address=self.connection_dict['zeo_address'],
zeo_storagename=CONFIG['zeo_storagename'], zeo_storagename=self.connection_dict['zeo_storagename'],
ip=self.getLocalIPv4Address()) ip=self.getLocalIPv4Address())
port = 12001 port = 12001
distribution_list = [self.installZope(port=port, name='zope_distribution', **common_kw)] distribution_list = [self.installZope(port=port, name='zope_distribution', **common_kw)]
...@@ -435,6 +435,9 @@ class Recipe(BaseSlapRecipe): ...@@ -435,6 +435,9 @@ class Recipe(BaseSlapRecipe):
'execute')], self.ws, sys.executable, self.wrapper_directory, arguments=[ 'execute')], self.ws, sys.executable, self.wrapper_directory, arguments=[
self.options['runzeo_binary'].strip(), '-C', zeo_conf_path] self.options['runzeo_binary'].strip(), '-C', zeo_conf_path]
)[0] )[0]
self.connection_dict['zeo_address'] = '%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port'])
self.connection_dict['zeo_storagename'] = CONFIG['zeo_storagename']
self.path_list.append(wrapper) self.path_list.append(wrapper)
def installZope(self, ip, port, name, zeo_address=None, zeo_storagename=None, def installZope(self, ip, port, name, zeo_address=None, zeo_storagename=None,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment