Working stack for occi

software/occi-xwiki/software.cfg

 [buildout]
 extends =
-  ../../stack/occi.cfg
+  ../../stack/occi/buildout.cfg
 
 parts =
-  template
-  template-occi
-  occi
+  instance
+  instance-occi
+  accords
   eggs
-  instance-recipe-egg
   occi-xwiki-manifest
 
 [occi-xwiki-manifest]

stack/occi/buildout.cfg

@@ -10,11 +10,10 @@ extends =
 versions = versions
 
 parts =
-  template
-  template-occi
-  occi
+  instance
+  instance-occi
+  accords
   eggs
-  template
 
 [eggs]
 recipe = zc.recipe.egg
@@ -22,21 +21,38 @@ eggs =
   ${lxml-python:egg}
 
 # If we use only one software type in the future, delete duplication of template
-[template]
+[instance]
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 3e1ea477d48080e9bdb98579f7f28be6
+#md5sum = 3e1ea477d48080e9bdb98579f7f28be6
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[template-occi]
+[instance-occi]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-occi.cfg
-md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
+#md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
 output = ${buildout:directory}/template-occi.cfg
 mode = 0644
 
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-004
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----

software/occi-xwiki/instance-occi.cfg → stack/occi/instance-occi.cfg

@@ -3,8 +3,6 @@ parts =
   url
   occi
 
-gzip-binary = ${gzip:location}/bin/gzip
-
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
@@ -22,8 +20,8 @@ ip = $${slap-network-information:local-ipv4}
 # Paths
 
 # Binary information
-parser = ${occi:location}/bin/bc-parser
-broker = ${occi:location}/bin/bc-broker
+parser = ${accords:location}/bin/bc-parser
+broker = ${accords:location}/bin/bc-broker
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory