Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
e1fa3b96
Commit
e1fa3b96
authored
Mar 06, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OCCI Instance is able to start accords
parent
d54cc6f0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
16 deletions
+19
-16
component/occi/buildout.cfg
component/occi/buildout.cfg
+2
-2
slapos/recipe/occi/__init__.py
slapos/recipe/occi/__init__.py
+4
-5
stack/occi/buildout.cfg
stack/occi/buildout.cfg
+1
-0
stack/occi/instance-occi.cfg
stack/occi/instance-occi.cfg
+12
-9
No files found.
component/occi/buildout.cfg
View file @
e1fa3b96
...
@@ -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
...
@@ -51,4 +51,4 @@ recipe = hexagonit.recipe.download
...
@@ -51,4 +51,4 @@ recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
url = ${:_profile_base_location_}/${:filename}
#md5sum = 22b0ef8baec5efc182e10d233c6f14ca
#md5sum = 22b0ef8baec5efc182e10d233c6f14ca
filename = accords-cocarrier-patch.diff
filename = accords-cocarrier-patch.diff
download-only = true
download-only = true
\ No newline at end of file
slapos/recipe/occi/__init__.py
View file @
e1fa3b96
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
##############################################################################
##############################################################################
import
os
import
os
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
f
or
m
subprocess
import
Popen
f
ro
m
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
stack/occi/buildout.cfg
View file @
e1fa3b96
...
@@ -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]
...
...
stack/occi/instance-occi.cfg
View file @
e1fa3b96
...
@@ -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,15 +48,15 @@ backup = $${rootdirectory:srv}/backup/
...
@@ -45,15 +48,15 @@ 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
${accords-source:location}/scripts/accords-config
${accords-source:location}/scripts/accords-config
${accords-source:location}/scripts/co-broker
${accords-source:location}/scripts/co-broker
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment