Merge branch 'master' into slapos

CHANGES.txt

-0.9 (unreleased)
+0.9 (2011-06-24)
 ================
 
- * No changes yet.
+ * mysql recipe : Changing slapos.recipe.erp5.execute to
+   slapos.recipe.librecipe.execute [Cedric de Saint Martin]
 
 0.8 (2011-06-15)
 ================
 
- * Add MySQL and MariaDB standalone software release and recipe [Cedric de Saint Martin]
+ * Add MySQL and MariaDB standalone software release and recipe
+   [Cedric de Saint Martin]
  * Fixed slapos.recipe.erp5testnode instantiation [Sebastien Robin]
 
 0.7 (2011-06-14)

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.9-dev'
+version = '0.9'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/mysql/__init__.py

@@ -99,9 +99,8 @@ class Recipe(BaseSlapRecipe):
     crontabs = os.path.join(self.etc_directory, 'crontabs')
     self._createDirectory(cron_d)
     self._createDirectory(crontabs)
-    # Use execute from erp5.
     wrapper = zc.buildout.easy_install.scripts([('crond',
-      'slapos.recipe.erp5.execute', 'execute')], self.ws, sys.executable,
+      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
       self.wrapper_directory, arguments=[
         self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
         '-t', timestamps, '-f', '-l', '5', '-M', catcher]
@@ -225,7 +224,7 @@ class Recipe(BaseSlapRecipe):
         self.substituteTemplate(template_filename,
           stunnel_conf))
     wrapper = zc.buildout.easy_install.scripts([('stunnel',
-      'slapos.recipe.erp5.execute', 'execute')], self.ws, sys.executable,
+      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
       self.wrapper_directory, arguments=[
         self.options['stunnel_binary'].strip(), stunnel_conf_path]
       )[0]
@@ -310,16 +309,14 @@ class Recipe(BaseSlapRecipe):
         '--defaults-file=%s' % mysql_conf_path,
         '--socket=%s' %mysql_conf['socket'].strip(), '--user=root']
     environment = dict(PATH='%s' % self.bin_directory)
-    # Use execute from erp5.
     innobackupex_incremental = zc.buildout.easy_install.scripts([(
-      'innobackupex_incremental', 'slapos.recipe.erp5.execute', 'executee')],
+      'innobackupex_incremental', 'slapos.recipe.librecipe.execute', 'executee')],
       self.ws, sys.executable, self.bin_directory, arguments=[
         innobackupex_argument_list + ['--incremental'],
         environment])[0]
     self.path_list.append(innobackupex_incremental)
-    # Use execute from erp5.
     innobackupex_full = zc.buildout.easy_install.scripts([('innobackupex_full',
-      'slapos.recipe.erp5.execute', 'executee')], self.ws,
+      'slapos.recipe.librecipe.execute', 'executee')], self.ws,
       sys.executable, self.bin_directory, arguments=[
         innobackupex_argument_list,
         environment])[0]

software/kumofs/software.cfg

@@ -72,13 +72,13 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.4
+slapos.cookbook = 0.7
 
 erp5.recipe.cmmiforcei686 = 0.1.1
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
 
-# Required by slapos.cookbook==0.4
+# Required by slapos.cookbook==0.7
 slapos.core = 0.2
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/mariadb/software.cfg

@@ -74,10 +74,10 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.8
+slapos.cookbook = 0.9
 
-# Required by slapos.cookbook==0.7
-slapos.core = 0.3
+# Required by slapos.cookbook==0.9
+slapos.core = 0.4
 collective.recipe.template = 1.8
 netaddr = 0.7.5
 xml-marshaller = 0.9.7

software/memcached/software.cfg

@@ -71,9 +71,9 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.4
+slapos.cookbook = 0.7
 
-# Required by slapos.cookbook==0.4
+# Required by slapos.cookbook==0.7
 slapos.core = 0.2
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/mysql-5.1/software.cfg

@@ -75,10 +75,10 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.8
+slapos.cookbook = 0.9
 
-# Required by slapos.cookbook==0.7
-slapos.core = 0.3
+# Required by slapos.cookbook==0.9
+slapos.core = 0.4
 collective.recipe.template = 1.8
 netaddr = 0.7.5
 xml-marshaller = 0.9.7