Changes to the software,instance and kvm buildout profile

software/kvm/instance.cfg

@@ -9,8 +9,8 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 qemu_path = ${kvm:location}/bin/qemu-system-x86_64
 qemu_img_path = ${kvm:location}/bin/qemu-img
-slapmonitor_path = ${buildout:bin-directory}/slapmonitor
-slapreport_path = ${buildout:bin-directory}/slapreport
+#slapmonitor_path = ${buildout:bin-directory}/slapmonitor
+#slapreport_path = ${buildout:bin-directory}/slapreport
 websockify_path = ${buildout:parts-directory}/websockify/websockify
 noVNC_location = ${buildout:parts-directory}/noVNC/
 

software/kvm/software.cfg

@@ -2,6 +2,17 @@
 
 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 =
   ${:slaposcookbook_recipe_location}
 
@@ -12,16 +23,6 @@ parts +=
   template
   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]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
@@ -31,7 +32,7 @@ mode = 0644
 
 [slaposcookbook]
 recipe = plone.recipe.command
-git_param = --quiet -b mysql
+git_param = --quiet -b kvm
 git = ${git:location}/bin/git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true

stack/kvm.cfg

 [buildout]
+##XXX upgrade to 2.7
 extends =
   ../component/python-2.6/buildout.cfg
   ../component/lxml-python/buildout.cfg
@@ -16,6 +17,7 @@ parts =
   gnutls
   kvm
   eggs
+  instance-recipe-egg
 
 find-links +=
   http://www.nexedi.org/static/packages/source/slapos.buildout/
@@ -26,6 +28,16 @@ versions = versions
 section = python2.6
 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]
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
@@ -79,15 +91,13 @@ stop-on-error = true
 #tag = slapos-v0.1
 command =
   (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
-#update-command =
-# cd ${:location} && ${git:location}/bin/git pull --quiet origin tag ${:tag}
+update-command =
+ cd ${:location} && ${git:location}/bin/git pull --quiet origin master
 
 [eggs]
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
-  slapos.recipe.kvm
-  slapos.tool.monitor
 
 [versions]
 zc.buildout = 1.5.3-dev-SlapOS-004