Use correct name ACCORDS for recipe

setup.py

@@ -40,6 +40,7 @@ setup(name=name,
       zip_safe=True,
       entry_points={
         'zc.buildout': [
+          'accords = slapos.recipe.accords:Recipe',
           'apache.frontend = slapos.recipe.apache_frontend:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
@@ -85,7 +86,6 @@ setup(name=name,
           'lamp.simple = slapos.recipe.lamp:Simple',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
-          'occi = slapos.recipe.occi:Recipe',
           'pbs = slapos.recipe.pbs:Recipe',
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',

software/occi-xwiki/software.cfg → software/accords-xwiki/software.cfg

 [buildout]
 extends =
-  ../../stack/occi/buildout.cfg
+  ../../stack/accords/buildout.cfg
 
 parts =
   instance
-  instance-occi
+  instance-accords
   accords
   eggs
-  occi-manifest
+  accords-manifest
 
-[occi-manifest]
+[accords-manifest]
 # Manifest for xwiki
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/xwiki.manifest.xml

stack/occi/buildout.cfg → stack/accords/buildout.cfg

@@ -3,7 +3,7 @@
 extends =
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../component/occi/buildout.cfg
+  ../../component/accords/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../slapos.cfg
 
@@ -11,7 +11,7 @@ versions = versions
 
 parts =
   instance
-  instance-occi
+  instance-accords
   accords
   eggs
 
@@ -30,11 +30,11 @@ url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[instance-occi]
+[instance-accords]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-occi.cfg
+url = ${:_profile_base_location_}/instance-accords.cfg
 #md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
-output = ${buildout:directory}/template-occi.cfg
+output = ${buildout:directory}/template-accords.cfg
 mode = 0644
 
 [versions]

stack/occi/instance-occi.cfg → stack/accords/instance-accords.cfg

 [buildout]
 parts =
   copy-scripts
-  occi
+  accords-instance
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -11,8 +11,8 @@ offline = true
 #recipe = slapos.cookbook:publishurl
 #url = 
 
-[occi]
-recipe = slapos.cookbook:occi
+[accords-instance]
+recipe = slapos.cookbook:accords
 
 # Options
 userid = cedric.de
@@ -26,7 +26,7 @@ listen-ip = $${slap-network-information:local-ipv4}
 
 # Paths
 accords-configuration-file = $${pocdirectory:poc}/accords.ini
-manifest-source = ${occi-manifest:target}
+manifest-source = ${accords-manifest:target}
 manifest-destination = $${pocdirectory:poc}/manifest.xml
 manifest-name = manifest
 accords-wrapper = $${basedirectory:services}/accords

stack/occi/instance.cfg → stack/accords/instance.cfg

@@ -9,4 +9,4 @@ offline = true
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${instance-occi:output}
+default = ${instance-accords:output}