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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 15:00:55 2011
New Revision: 44126

URL: http://svn.erp5.org?rev=44126&view=rev
Log:
 - do not store ZEO configuration 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=44126&r1=44125&r2=44126&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:00:55 2011
@@ -109,10 +109,10 @@ class Recipe(BaseSlapRecipe):
     url_list = []
     if 'activity_node_amount' in self.parameter_dict or \
        'login_node_amount' in self.parameter_dict:
-      self.installZeo()
+      self.zeo_address, self.zeo_storagename = self.installZeo()
       common_kw = dict(
-          zeo_address=self.connection_dict['zeo_address'],
-          zeo_storagename=self.connection_dict['zeo_storagename'],
+          zeo_address=self.zeo_address,
+          zeo_storagename=self.zeo_storagename,
           ip=self.getLocalIPv4Address())
       port = 12001
       distribution_list = [self.installZope(port=port, name='zope_distribution',
@@ -434,10 +434,8 @@ class Recipe(BaseSlapRecipe):
       'execute')], self.ws, sys.executable, self.wrapper_directory, arguments=[
         self.options['runzeo_binary'].strip(), '-C', zeo_conf_path]
       )[0]
-    self.connection_dict['zeo_address'] = '%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port'])
-    self.connection_dict['zeo_storagename'] = CONFIG['zeo_storagename']
- 
     self.path_list.append(wrapper)
+    return '%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']), CONFIG['zeo_storagename']
 
   def installZope(self, ip, port, name, zeo_address=None, zeo_storagename=None,
       zodb_root_path=None, with_timerservice=False, timeserver_interval=5):