[Erp5-report] r44108 luke - in /erp5/trunk/utils/slapos.recipe.erp5: ./ src/slapos/recipe/e...

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 13:17:54 2011
New Revision: 44108

URL: http://svn.erp5.org?rev=44108&view=rev
Log:
 - there is no need to create keyauth nodes

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

Modified: erp5/trunk/utils/slapos.recipe.erp5/README.txt
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/README.txt?rev=44108&r1=44107&r2=44108&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/README.txt [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/README.txt [utf8] Thu Mar 10 13:17:54 2011
@@ -4,8 +4,8 @@ The slapos.recipe.erp5 aims to instancia
 SLAP parameters
 ---------------
 
-activity_node_amount, login_node_amount, keyauth_node_amount
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+activity_node_amount, login_node_amount
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :Optional: Yes
 :Type: integer

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=44108&r1=44107&r2=44108&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:17:54 2011
@@ -109,8 +109,7 @@ class Recipe(BaseSlapRecipe):
                                             CONFIG['zodb_root_filename'])
     url_list = []
     if 'activity_node_amount' in self.parameter_dict or \
-       'login_node_amount' in self.parameter_dict or \
-       'keyauth_node_amount' in self.parameter_dict:
+       'login_node_amount' in self.parameter_dict:
       self.installZeo()
       common_kw = dict(
           zeo_address='%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']),
@@ -126,11 +125,7 @@ class Recipe(BaseSlapRecipe):
       for i in xrange(1, int(self.parameter_dict.get('login_node_amount', 0)) + 1):
         port += 1
         login_list.append(self.installZope(port=port, name='zope_login_%s' % i, **common_kw))
-      keyauth_list = []
-      for i in xrange(1, int(self.parameter_dict.get('keyauth_node_amount', 0)) + 1):
-        port += 1
-        keyauth_list.append(self.installZope(port=port, name='keyauth_login_%s' % i, **common_kw))
-      url_list = activity_list + login_list + keyauth_list + distribution_list
+      url_list = activity_list + login_list + distribution_list
     else:
       url_list.append(self.installZope(ip=self.getLocalIPv4Address(),
           port=12000 + 1, name='zope_%s' % 1, zodb_root_path=CONFIG['zodb_root_path']))