Commit 21c0a6aa authored by Łukasz Nowak's avatar Łukasz Nowak

- do not expose haproxy parameters in connection dict


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44130 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b89ed82d
...@@ -132,14 +132,13 @@ class Recipe(BaseSlapRecipe): ...@@ -132,14 +132,13 @@ class Recipe(BaseSlapRecipe):
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']))
self.connection_dict.update( 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(), port=13000,
backend=self.connection_dict['haproxy_login'])) 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