[Erp5-report] r44130 luke - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 15:22:26 2011
New Revision: 44130

URL: http://svn.erp5.org?rev=44130&view=rev
Log:
 - do not expose haproxy parameters in connection dict

Modified:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py?rev=44130&r1=44129&r2=44130&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] Thu Mar 10 15:22:26 2011
@@ -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