Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Roque
slapos
Commits
905dbe57
Commit
905dbe57
authored
Mar 07, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrapper to launch acccords
parent
e1fa3b96
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
slapos/recipe/occi/__init__.py
slapos/recipe/occi/__init__.py
+11
-6
stack/occi/instance-occi.cfg
stack/occi/instance-occi.cfg
+5
-1
No files found.
slapos/recipe/occi/__init__.py
View file @
905dbe57
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
#
#
##############################################################################
##############################################################################
import
os
import
os
import
shutil
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
subprocess
import
Popen
from
subprocess
import
Popen
...
@@ -50,16 +51,20 @@ class Recipe(GenericBaseRecipe):
...
@@ -50,16 +51,20 @@ class Recipe(GenericBaseRecipe):
).
communicate
()
).
communicate
()
# Generate manifest
# Generate manifest
manifest_origin_location
=
self
.
options
[
'manifest'
]
manifest_origin_location
=
self
.
options
[
'manifest
-source
'
]
manifest_location
=
self
.
options
[
'manifest-destination'
]
manifest_location
=
self
.
options
[
'manifest-destination'
]
s
elf
.
createFile
(
manifest_origin_location
,
manifest_location
)
s
hutil
.
copy
(
manifest_origin_location
,
manifest_location
)
path_list
.
append
(
manifest_location
)
path_list
.
append
(
manifest_location
)
# Generate wrapper
# Generate wrapper
# XXX create wrapper
wrapper_config_dict
=
dict
(
#path_list.append(self.createExecutable(self.options['server-wrapper'],
poc_location
=
poc_location
,
# self.substituteTemplate(self.getTemplateFilename('accords.in'),
manifest_name
=
self
.
options
[
'manifest-name'
],
# config)))
# XXX this is workaround
accords_lib_directory
=
self
.
options
[
'accords_lib_directory'
])
path_list
.
append
(
self
.
createExecutable
(
self
.
options
[
'accords'
],
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'accords.in'
),
wrapper_config_dict
)))
return
path_list
return
path_list
stack/occi/instance-occi.cfg
View file @
905dbe57
...
@@ -24,8 +24,12 @@ domain = hardcode
...
@@ -24,8 +24,12 @@ domain = hardcode
os-config = $${pocdirectory:poc}/os-config.xml
os-config = $${pocdirectory:poc}/os-config.xml
# Paths
# Paths
manifest = ${occi-manifest:location}/${occi-manifest:filename}
manifest
-source
= ${occi-manifest:location}/${occi-manifest:filename}
manifest-destination = $${pocdirectory:poc}/manifest.xml
manifest-destination = $${pocdirectory:poc}/manifest.xml
manifest-name = $${pocdirectory:poc}/manifest.xml
dash-location = TODO
# Workaround
accords_lib_directory : ${accords:location}/lib
# Binary information
# Binary information
accords = ${accords:location}/bin/parser
accords = ${accords:location}/bin/parser
...
...
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