From b110daedd4f55a7abddb5293ea053bf61eafbe8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Tue, 13 Mar 2012 17:03:32 +0100
Subject: [PATCH] Use correct name ACCORDS for recipe
---
component/{occi => accords}/buildout.cfg | 0
setup.py | 2 +-
slapos/recipe/{occi => accords}/__init__.py | 0
slapos/recipe/{occi => accords}/accords.py | 0
.../recipe/{occi => accords}/template/accords.ini.in | 0
slapos/recipe/{occi => accords}/template/coips.xml.in | 0
.../recipe/{occi => accords}/template/os_config.xml.in | 0
software/{occi-xwiki => accords-xwiki}/software.cfg | 8 ++++----
.../{occi-xwiki => accords-xwiki}/xwiki.manifest.xml | 0
stack/{occi => accords}/buildout.cfg | 10 +++++-----
.../instance-occi.cfg => accords/instance-accords.cfg} | 8 ++++----
stack/{occi => accords}/instance.cfg | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
rename component/{occi => accords}/buildout.cfg (100%)
rename slapos/recipe/{occi => accords}/__init__.py (100%)
rename slapos/recipe/{occi => accords}/accords.py (100%)
rename slapos/recipe/{occi => accords}/template/accords.ini.in (100%)
rename slapos/recipe/{occi => accords}/template/coips.xml.in (100%)
rename slapos/recipe/{occi => accords}/template/os_config.xml.in (100%)
rename software/{occi-xwiki => accords-xwiki}/software.cfg (69%)
rename software/{occi-xwiki => accords-xwiki}/xwiki.manifest.xml (100%)
rename stack/{occi => accords}/buildout.cfg (89%)
rename stack/{occi/instance-occi.cfg => accords/instance-accords.cfg} (95%)
rename stack/{occi => accords}/instance.cfg (85%)
diff --git a/component/occi/buildout.cfg b/component/accords/buildout.cfg
similarity index 100%
rename from component/occi/buildout.cfg
rename to component/accords/buildout.cfg
diff --git a/setup.py b/setup.py
index 611b7ef77..f7693be7b 100644
--- a/setup.py
+++ b/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',
diff --git a/slapos/recipe/occi/__init__.py b/slapos/recipe/accords/__init__.py
similarity index 100%
rename from slapos/recipe/occi/__init__.py
rename to slapos/recipe/accords/__init__.py
diff --git a/slapos/recipe/occi/accords.py b/slapos/recipe/accords/accords.py
similarity index 100%
rename from slapos/recipe/occi/accords.py
rename to slapos/recipe/accords/accords.py
diff --git a/slapos/recipe/occi/template/accords.ini.in b/slapos/recipe/accords/template/accords.ini.in
similarity index 100%
rename from slapos/recipe/occi/template/accords.ini.in
rename to slapos/recipe/accords/template/accords.ini.in
diff --git a/slapos/recipe/occi/template/coips.xml.in b/slapos/recipe/accords/template/coips.xml.in
similarity index 100%
rename from slapos/recipe/occi/template/coips.xml.in
rename to slapos/recipe/accords/template/coips.xml.in
diff --git a/slapos/recipe/occi/template/os_config.xml.in b/slapos/recipe/accords/template/os_config.xml.in
similarity index 100%
rename from slapos/recipe/occi/template/os_config.xml.in
rename to slapos/recipe/accords/template/os_config.xml.in
diff --git a/software/occi-xwiki/software.cfg b/software/accords-xwiki/software.cfg
similarity index 69%
rename from software/occi-xwiki/software.cfg
rename to software/accords-xwiki/software.cfg
index 411341780..52fe371da 100644
--- a/software/occi-xwiki/software.cfg
+++ b/software/accords-xwiki/software.cfg
@@ -1,15 +1,15 @@
[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
diff --git a/software/occi-xwiki/xwiki.manifest.xml b/software/accords-xwiki/xwiki.manifest.xml
similarity index 100%
rename from software/occi-xwiki/xwiki.manifest.xml
rename to software/accords-xwiki/xwiki.manifest.xml
diff --git a/stack/occi/buildout.cfg b/stack/accords/buildout.cfg
similarity index 89%
rename from stack/occi/buildout.cfg
rename to stack/accords/buildout.cfg
index edcd970a7..dce3578c2 100644
--- a/stack/occi/buildout.cfg
+++ b/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]
diff --git a/stack/occi/instance-occi.cfg b/stack/accords/instance-accords.cfg
similarity index 95%
rename from stack/occi/instance-occi.cfg
rename to stack/accords/instance-accords.cfg
index 45d2c609f..857c986c5 100644
--- a/stack/occi/instance-occi.cfg
+++ b/stack/accords/instance-accords.cfg
@@ -1,7 +1,7 @@
[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
diff --git a/stack/occi/instance.cfg b/stack/accords/instance.cfg
similarity index 85%
rename from stack/occi/instance.cfg
rename to stack/accords/instance.cfg
index 6191d456d..808a731ec 100644
--- a/stack/occi/instance.cfg
+++ b/stack/accords/instance.cfg
@@ -9,4 +9,4 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
-default = ${instance-occi:output}
+default = ${instance-accords:output}
--
2.30.9