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

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 14:28:12 2011
New Revision: 44120

URL: http://svn.erp5.org?rev=44120&view=rev
Log:
 - expose 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=44120&r1=44119&r2=44120&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 14:28:12 2011
@@ -111,8 +111,8 @@ class Recipe(BaseSlapRecipe):
        'login_node_amount' in self.parameter_dict:
       self.installZeo()
       common_kw = dict(
-          zeo_address='%s:%s' % (CONFIG['zeo_ip'], CONFIG['zeo_port']),
-          zeo_storagename=CONFIG['zeo_storagename'],
+          zeo_address=self.connection_dict['zeo_address'],
+          zeo_storagename=self.connection_dict['zeo_storagename'],
           ip=self.getLocalIPv4Address())
       port = 12001
       distribution_list = [self.installZope(port=port, name='zope_distribution', **common_kw)] 
@@ -435,6 +435,9 @@ 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)
 
   def installZope(self, ip, port, name, zeo_address=None, zeo_storagename=None,