From 21c0a6aa3d431cc34ceee30dfef4cc7c95645abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 10 Mar 2011 14:22:26 +0000 Subject: [PATCH] - 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 --- slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py index 1ecd43ef7f..ca3b4545bb 100644 --- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py +++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py @@ -132,14 +132,13 @@ class Recipe(BaseSlapRecipe): url_list.append(self.installZope(ip=self.getLocalIPv4Address(), 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', 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( apache_login=self.installLoginApache(ip=self.getGlobalIPv6Address(), port=13000, - backend=self.connection_dict['haproxy_login'])) + backend=haproxy_login)) self.installTestRunner() self.linkBinary() return self.path_list -- 2.30.9