From 2a3e67c157814f15328416cf13a3c1ba91f04c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 3 Jun 2011 23:16:16 +0200 Subject: [PATCH] Memcached : update recipe and profile, copying from mysql --- slapos/recipe/memcached/__init__.py | 3 +-- software/memcached/software.cfg | 39 +++++++++++++---------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/slapos/recipe/memcached/__init__.py b/slapos/recipe/memcached/__init__.py index a9c73139d..e0f69498a 100644 --- a/slapos/recipe/memcached/__init__.py +++ b/slapos/recipe/memcached/__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? - memcached_conf = self.installMemcached(ip=self.getLocalIPv4Address(), + memcached_conf = self.installMemcached(ip=self.getGlobalIPv6Address(), port=11000) self.linkBinary() self.setConnectionDict(dict( diff --git a/software/memcached/software.cfg b/software/memcached/software.cfg index 7e33f54aa..f60d23d6f 100644 --- a/software/memcached/software.cfg +++ b/software/memcached/software.cfg @@ -1,24 +1,31 @@ [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/git/buildout.cfg - ../../component/memcached/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 @@ -27,30 +34,20 @@ parts += # development / fast switching environment for whole software unzip = true -#[rebootstrap] -# Default first version of rebootstrapped python -#version = 2 -#section = python2.7 +[sources] +# Include information related to official mysql source code. +mysql = git http://git.erp5.org/repos/slapos.git branch=mysql -[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 +[rebootstrap] +# Default first version of rebootstrapped python +version = 2 +section = python2.7 [instance-recipe] egg = slapos.cookbook module = memcached [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} -- 2.30.9