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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 13:19:02 2011
New Revision: 44109

URL: http://svn.erp5.org?rev=44109&view=rev
Log:
 - create haproxy configuration based only on login nodes

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=44109&r1=44108&r2=44109&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 13:19:02 2011
@@ -127,11 +127,12 @@ class Recipe(BaseSlapRecipe):
         login_list.append(self.installZope(port=port, name='zope_login_%s' % i, **common_kw))
       url_list = activity_list + login_list + distribution_list
     else:
+      login_list = url_list
       url_list.append(self.installZope(ip=self.getLocalIPv4Address(),
           port=12000 + 1, name='zope_%s' % 1, zodb_root_path=CONFIG['zodb_root_path']))
 
     self.installHaproxy(ip=self.getGlobalIPv6Address(), port='15000',
-        name='login', url_list=url_list)
+        name='login', url_list=login_list)
     self.installTestRunner()
     self.linkBinary()
     self.computer_partition.setConnectionDict(self.connection_dict)