Occi is a stack now. occi-xwiki uses this stack to deploy xwiki using COORDS

software/occi-xwiki/software.cfg

+[buildout]
+extends =
+  ../../stack/occi.cfg
+
+parts =
+  template
+  template-occi
+  occi
+  eggs
+  instance-recipe-egg
+  occi-xwiki-manifest
+
+[occi-xwiki-manifest]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/xwiki.manifest.cfg.in
+#md5sum = 3e1ea477d48080e9bdb98579f7f28be6
+filename = xwiki.manifest.cfg
+location = ${buildout:parts-directory}/${:_buildout_section_name_}

software/occi/software.cfg → stack/occi/buildout.cfg

 [buildout]
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/mariadb/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/occi/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
-# XXX: This is dirty, recipe trick shall be used.
-develop =
-  /opt/slapdev
+  ../slapos.cfg
 
 versions = versions
 
 parts =
   template
-  instance-occi
+  template-occi
   occi
   eggs
-  instance-recipe-egg
-
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs = ${instance-recipe:egg}
+  template
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
 
+# If we use only one software type in the future, delete duplication of template
 [template]
 # Default template for the instance.
 recipe = slapos.recipe.template
@@ -60,11 +30,11 @@ md5sum = 3e1ea477d48080e9bdb98579f7f28be6
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[instance-occi]
+[template-occi]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-mariadb.cfg
+url = ${:_profile_base_location_}/instance-occi.cfg
 md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
-output = ${buildout:directory}/template-mariadb.cfg
+output = ${buildout:directory}/template-occi.cfg
 mode = 0644
 
 [versions]