Commit c862ee35 authored by Łukasz Nowak's avatar Łukasz Nowak

- there is no need to create keyauth nodes


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44108 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 15ee5871
...@@ -4,8 +4,8 @@ The slapos.recipe.erp5 aims to instanciate an ERP5 environnment ...@@ -4,8 +4,8 @@ The slapos.recipe.erp5 aims to instanciate an ERP5 environnment
SLAP parameters SLAP parameters
--------------- ---------------
activity_node_amount, login_node_amount, keyauth_node_amount activity_node_amount, login_node_amount
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
:Optional: Yes :Optional: Yes
:Type: integer :Type: integer
......
...@@ -109,8 +109,7 @@ class Recipe(BaseSlapRecipe): ...@@ -109,8 +109,7 @@ class Recipe(BaseSlapRecipe):
CONFIG['zodb_root_filename']) CONFIG['zodb_root_filename'])
url_list = [] url_list = []
if 'activity_node_amount' in self.parameter_dict or \ if 'activity_node_amount' in self.parameter_dict or \
'login_node_amount' in self.parameter_dict or \ 'login_node_amount' in self.parameter_dict:
'keyauth_node_amount' in self.parameter_dict:
self.installZeo() self.installZeo()
common_kw = dict( common_kw = dict(
zeo_address='%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']), zeo_address='%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']),
...@@ -126,11 +125,7 @@ class Recipe(BaseSlapRecipe): ...@@ -126,11 +125,7 @@ class Recipe(BaseSlapRecipe):
for i in xrange(1, int(self.parameter_dict.get('login_node_amount', 0)) + 1): for i in xrange(1, int(self.parameter_dict.get('login_node_amount', 0)) + 1):
port += 1 port += 1
login_list.append(self.installZope(port=port, name='zope_login_%s' % i, **common_kw)) login_list.append(self.installZope(port=port, name='zope_login_%s' % i, **common_kw))
keyauth_list = [] url_list = activity_list + login_list + distribution_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
else: else:
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']))
......
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