From de04b5235ccd7bcc26ceec3318ac88cdcabbc920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Thu, 10 Mar 2011 13:28:12 +0000
Subject: [PATCH]  - expose zeo configuration in connection dict

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44120 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
index a77d3a8263..3a71a00d39 100644
--- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
@@ -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,
-- 
2.30.9