Commit 0b439206 authored by Vivien Alger's avatar Vivien Alger

Changes to the software,instance and kvm buildout profile

parent 2a703825
...@@ -9,8 +9,8 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} ...@@ -9,8 +9,8 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
recipe = ${instance-recipe:egg}:${instance-recipe:module} recipe = ${instance-recipe:egg}:${instance-recipe:module}
qemu_path = ${kvm:location}/bin/qemu-system-x86_64 qemu_path = ${kvm:location}/bin/qemu-system-x86_64
qemu_img_path = ${kvm:location}/bin/qemu-img qemu_img_path = ${kvm:location}/bin/qemu-img
slapmonitor_path = ${buildout:bin-directory}/slapmonitor #slapmonitor_path = ${buildout:bin-directory}/slapmonitor
slapreport_path = ${buildout:bin-directory}/slapreport #slapreport_path = ${buildout:bin-directory}/slapreport
websockify_path = ${buildout:parts-directory}/websockify/websockify websockify_path = ${buildout:parts-directory}/websockify/websockify
noVNC_location = ${buildout:parts-directory}/noVNC/ noVNC_location = ${buildout:parts-directory}/noVNC/
......
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
dist.repoze.org
effbot.org
github.com
peak.telecommunity.com
psutil.googlecode.com
www.dabeaz.com
develop = develop =
${:slaposcookbook_recipe_location} ${:slaposcookbook_recipe_location}
...@@ -12,16 +23,6 @@ parts += ...@@ -12,16 +23,6 @@ parts +=
template template
instance-recipe-egg instance-recipe-egg
[instance-recipe]
egg = slapos.cookbook
module = kvm
[instance-recipe-egg]
slaposcookbook_dummy = ${slaposcookbook:location}
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
...@@ -31,7 +32,7 @@ mode = 0644 ...@@ -31,7 +32,7 @@ mode = 0644
[slaposcookbook] [slaposcookbook]
recipe = plone.recipe.command recipe = plone.recipe.command
git_param = --quiet -b mysql git_param = --quiet -b kvm
git = ${git:location}/bin/git git = ${git:location}/bin/git
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true stop-on-error = true
......
[buildout] [buildout]
##XXX upgrade to 2.7
extends = extends =
../component/python-2.6/buildout.cfg ../component/python-2.6/buildout.cfg
../component/lxml-python/buildout.cfg ../component/lxml-python/buildout.cfg
...@@ -16,6 +17,7 @@ parts = ...@@ -16,6 +17,7 @@ parts =
gnutls gnutls
kvm kvm
eggs eggs
instance-recipe-egg
find-links += find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
...@@ -26,6 +28,16 @@ versions = versions ...@@ -26,6 +28,16 @@ versions = versions
section = python2.6 section = python2.6
version = 1 version = 1
[instance-recipe]
egg = slapos.cookbook
module = kvm
[instance-recipe-egg]
slaposcookbook_dummy = ${slaposcookbook:location}
recipe = zc.recipe.egg
python = python2.6
eggs = ${instance-recipe:egg}
[gpg-error] [gpg-error]
recipe = hexagonit.recipe.cmmi recipe = hexagonit.recipe.cmmi
url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
...@@ -79,15 +91,13 @@ stop-on-error = true ...@@ -79,15 +91,13 @@ stop-on-error = true
#tag = slapos-v0.1 #tag = slapos-v0.1
command = command =
(${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1) (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
#update-command = update-command =
# cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag} cd ${:location} && ${git:location}/bin/git pull --quiet origin master
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
slapos.recipe.kvm
slapos.tool.monitor
[versions] [versions]
zc.buildout = 1.5.3-dev-SlapOS-004 zc.buildout = 1.5.3-dev-SlapOS-004
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment