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

- just a bit of formatting


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44134 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 41692152
...@@ -116,7 +116,7 @@ class Recipe(BaseSlapRecipe): ...@@ -116,7 +116,7 @@ class Recipe(BaseSlapRecipe):
ip=self.getLocalIPv4Address()) ip=self.getLocalIPv4Address())
port = 12001 port = 12001
distribution_list = [self.installZope(port=port, name='zope_distribution', distribution_list = [self.installZope(port=port, name='zope_distribution',
with_timerservice=True, **common_kw)] with_timerservice=True, **common_kw)]
activity_list = [] activity_list = []
for i in xrange(1, int(self.parameter_dict.get('activity_node_amount', 0)) + 1): for i in xrange(1, int(self.parameter_dict.get('activity_node_amount', 0)) + 1):
port += 1 port += 1
...@@ -125,20 +125,22 @@ class Recipe(BaseSlapRecipe): ...@@ -125,20 +125,22 @@ class Recipe(BaseSlapRecipe):
login_list = [] login_list = []
for i in xrange(1, int(self.parameter_dict.get('login_node_amount', 0)) + 1): for i in xrange(1, int(self.parameter_dict.get('login_node_amount', 0)) + 1):
port += 1 port += 1
login_list.append(self.installZope(port=port, name='zope_login_%s' % i, **common_kw)) login_list.append(self.installZope(port=port, name='zope_login_%s' % i,
**common_kw))
url_list = activity_list + login_list + distribution_list url_list = activity_list + login_list + distribution_list
else: else:
login_list = url_list login_list = url_list
url_list.append(self.installZope(ip=self.getLocalIPv4Address(), url_list.append(self.installZope(ip=self.getLocalIPv4Address(),
port=12000 + 1, name='zope_%s' % 1, zodb_root_path=CONFIG['zodb_root_path'])) port=12000 + 1, name='zope_%s' % 1,
zodb_root_path=CONFIG['zodb_root_path']))
haproxy_login = self.installHaproxy( haproxy_login = self.installHaproxy(
ip=self.getLocalIPv4Address(), port='15000', name='login', ip=self.getLocalIPv4Address(), port='15000', name='login',
url_list=login_list, server_check_path= url_list=login_list, server_check_path=
self.parameter_dict.get('server_check_path', '/erp5/getId')) self.parameter_dict.get('server_check_path', '/erp5/getId'))
self.connection_dict.update( self.connection_dict.update(
apache_login=self.installLoginApache(ip=self.getGlobalIPv6Address(), port=13000, apache_login=self.installLoginApache(ip=self.getGlobalIPv6Address(),
backend=haproxy_login)) port=13000, backend=haproxy_login))
self.installTestRunner() self.installTestRunner()
self.linkBinary() self.linkBinary()
return self.path_list return self.path_list
......
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