OCCI Instance is able to start accords

parent d54cc6f0
......@@ -17,7 +17,7 @@ url = http://git.gitorious.ow2.org/ow2-compatibleone/accords-platform.git
command =
(${git:location}/bin/git clone --quiet ${:url} ${:location} ) || (rm -fr ${:location} ; exit 1)
update-command =
cd ${:location} && ${git:location}/bin/git pull --quiet origin master
(cd ${:location} && ${git:location}/bin/git pull --quiet origin master)
[accords]
# Part of Compatible One project
......
......@@ -26,7 +26,7 @@
##############################################################################
import os
from slapos.recipe.librecipe import GenericBaseRecipe
form subprocess import Popen
from subprocess import Popen
class Recipe(GenericBaseRecipe):
def install(self):
......@@ -35,7 +35,6 @@ class Recipe(GenericBaseRecipe):
# Generate os-config.xml
os_config_parameters = dict(
userid=self.options['userid'],
userid=self.options['userid'],
password=self.options['password'],
domain=self.options['domain'],
......@@ -59,8 +58,8 @@ class Recipe(GenericBaseRecipe):
# Generate wrapper
# XXX create wrapper
path_list.append(self.createExecutable(self.options['server-wrapper'],
self.substituteTemplate(self.getTemplateFilename('accords.in'),
config)))
#path_list.append(self.createExecutable(self.options['server-wrapper'],
# self.substituteTemplate(self.getTemplateFilename('accords.in'),
# config)))
return path_list
......@@ -19,6 +19,7 @@ parts =
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
slapos.cookbook
# If we use only one software type in the future, delete duplication of template
[instance]
......
......@@ -15,9 +15,12 @@ offline = true
recipe = slapos.cookbook:occi
# Options
userid = $${slap-parameter:userid}
password = $${slap-parameter:password}
domain = $${slap-parameter:domain}
userid = hardcode
password = hardcode
domain = hardcode
#userid = $${slap-parameter:userid}
#password = $${slap-parameter:password}
#domain = $${slap-parameter:domain}
os-config = $${pocdirectory:poc}/os-config.xml
# Paths
......@@ -45,13 +48,13 @@ backup = $${rootdirectory:srv}/backup/
[pocdirectory]
recipe = slapos.cookbook:mkdirectory
poc = $${rootdirectory:poc}/poc
rest = $${rootdirectory:poc}/poc/rest
service = $${rootdirectory:poc}/poc/service
security = $${rootdirectory:poc}/poc/security
poc = $${rootdirectory:srv}/poc
rest = $${pocdirectory:poc}/rest
service = $${pocdirectory:poc}/service
security = $${pocdirectory:poc}/security
[copy-scripts]
recipe = slapos.cookbook:symbolic.link
recipe = slapos.cookbook:copyfilelist
target-directory = $${pocdirectory:poc}
file-list =
${accords-source:location}/scripts/accords
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment