OCCI Instance is able to start accords

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