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
isaak yansane-sisk
slapos
Commits
3bfc9822
Commit
3bfc9822
authored
Jan 04, 2015
by
Jérome Perrin
Committed by
Kazuhiko Shiozaki
Jan 09, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DREAM: Cleanup software to use components
parent
92513b3a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
43 deletions
+29
-43
software/dream/instance.cfg
software/dream/instance.cfg
+7
-7
software/dream/software.cfg
software/dream/software.cfg
+22
-36
No files found.
software/dream/instance.cfg
View file @
3bfc9822
...
@@ -8,6 +8,7 @@ eggs-directory = ${buildout:eggs-directory}
...
@@ -8,6 +8,7 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
offline = true
# parameters
[instance-parameter]
[instance-parameter]
recipe = slapos.cookbook:slapconfiguration
recipe = slapos.cookbook:slapconfiguration
computer = $${slap_connection:computer_id}
computer = $${slap_connection:computer_id}
...
@@ -15,16 +16,18 @@ partition = $${slap_connection:partition_id}
...
@@ -15,16 +16,18 @@ partition = $${slap_connection:partition_id}
url = $${slap_connection:server_url}
url = $${slap_connection:server_url}
key = $${slap_connection:key_file}
key = $${slap_connection:key_file}
cert = $${slap_connection:cert_file}
cert = $${slap_connection:cert_file}
[dream_platform_parameter]
port = 5000
port = 5000
host = $${
slap-network-information:local-ipv4
}
host = $${
instance-parameter:ipv6-random
}
# service
[dream_platform]
[dream_platform]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/dream_platform --host $${
instance-parameter:host} --port $${instance-parameter:port}
command-line = ${buildout:bin-directory}/dream_platform --host $${
dream_platform_parameter:host} --port $${dream_platform_parameter:port} --log $${directory:log}/dream_platform.log
wrapper-path = $${directory:service}/dream_platform
wrapper-path = $${directory:service}/dream_platform
parameters-extra = true
parameters-extra = true
# CLI
[dream_simulation]
[dream_simulation]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/dream_simulation
command-line = ${buildout:bin-directory}/dream_simulation
...
@@ -43,8 +46,5 @@ log = $${:var}/log
...
@@ -43,8 +46,5 @@ log = $${:var}/log
[publish-connection-parameter]
[publish-connection-parameter]
recipe = slapos.cookbook:publishurl
recipe = slapos.cookbook:publishurl
url = http://
$${instance-parameter:host}:$${instance-
parameter:port}
url = http://
[$${dream_platform_parameter:host}]:$${dream_platform_
parameter:port}
; FIXME: how to enable this without "switch" swoftare type ?
[slap-network-information]
local-ipv4 = 0.0.0.0
software/dream/software.cfg
View file @
3bfc9822
[buildout]
[buildout]
versions = versions
extends =
extends =
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/numpy/buildout.cfg
../../component/manpy/buildout.cfg
../../component/r-language/buildout.cfg
parts =
parts +=
rpy2
slapos-cookbook
slapos-cookbook
dream-build
manpy
dream
instance
instance
[rpy2_env]
PATH = ${r-language:location}/bin/:%(PATH)s
[rpy2]
recipe = zc.recipe.egg:custom
environment = rpy2_env
egg = rpy2>=2.3,<2.4
[dream-repository.git]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/dream.git
branch = master
git-executable = ${git:location}/bin/git
[dream-build]
; use a develop egg to easily develop and because dream already exist on pypi
; https://pypi.python.org/pypi/dream
recipe = zc.recipe.egg:develop
dependency = ${scipy-build:recipe}
setup = ${dream-repository.git:location}
[dream]
recipe = zc.recipe.egg:scripts
eggs = dream
initialization =
# rpy2 needs R in $PATH
import os
os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ['PATH']
[instance]
[instance]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/instance.cfg
output = ${buildout:directory}/instance.cfg
[versions]
rpy2 = 2.4.0
pydot = 1.0.28
xlrd = 0.9.3
xlwt = 0.7.5
pyparsing = 2.0.3
numpy = 1.9.1
scipy = 0.13.3
simpy = 3.0.5
# indirect dependancies
collective.recipe.template = 1.11
cp.recipe.cmd = 0.5
plone.recipe.command = 1.1
slapos.recipe.template = 2.6
zope.exceptions = 4.0.7
zope.testing = 4.1.3
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