Kumofs : update recipe and profile, copying from mysql

slapos/recipe/kumofs/__init__.py

@@ -37,9 +37,8 @@ class Recipe(BaseSlapRecipe):
 
   def _install(self):
     self.path_list = []
-    self.requirements, self.ws = self.egg.working_set([__name__])
     # XXX-Cedric : add logrotate?
-    kumo_conf = self.installKumo(self.getLocalIPv4Address())
+    kumo_conf = self.installKumo(self.getGlobalIPv6Address())
     self.linkBinary()
     self.setConnectionDict(dict(
       address = kumo_conf['kumo_address'],

software/kumofs/software.cfg

 [buildout]
-slaposcookbook_location = ${:parts-directory}/slaposcookbook
 
-develop = ${:slaposcookbook_location}
+sources = sources
+auto-checkout = mysql
 
 extensions =
   slapos.tool.networkcache
   slapos.zcbworkarounds
-#slapos.rebootstrap
+  slapos.rebootstrap
+  mr.developer
 
 find-links =
     http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/kumo/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/mysql-5.1/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
 
 versions = versions
 
 parts +=
 # Create instance template
+#TODO : list here all parts.
   template
   instance-recipe-egg
 
@@ -26,36 +34,20 @@ parts +=
 # development / fast switching environment for whole software
 unzip = true
 
-[instance-recipe]
-# Note: In case if specific instantiation recipe is used this is the place to
-# put its name
-egg = slapos.cookbook
-module = kumofs
+[sources]
+# Include information related to official mysql source code.
+mysql = git http://git.erp5.org/repos/slapos.git branch=mysql
 
-#[rebootstrap]
+[rebootstrap]
 # Default first version of rebootstrapped python
-#version = 2
-#section = python2.7
-
-[slaposcookbook]
-recipe = plone.recipe.command
-git_param =--quiet -b mysql
-git = ${git:location}/bin/git
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1;
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+version = 2
+section = python2.7
 
 [instance-recipe]
 egg = slapos.cookbook
 module = kumofs
 
 [instance-recipe-egg]
-# Just so buildout executes [slaposcookbook] before [eggs], as
-# - [eggs] references [slaposcookbook]
-# - [instance-recipe] needs [slaposcookbook] to be finished
-# - we cannot rely on anything else being executed before [instance-recipe]
-slaposcookbook_dummy = ${slaposcookbook:location}
 recipe = zc.recipe.egg
 #python = python2.6
 eggs = ${instance-recipe:egg}