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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
slapos
Commits
76550efa
Commit
76550efa
authored
Jun 11, 2015
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IPython Notebook: Added software type default and notebook for notebook software release
parent
029b9b28
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
23 deletions
+41
-23
software/ipython_notebook/instance-default.cfg.in
software/ipython_notebook/instance-default.cfg.in
+21
-0
software/ipython_notebook/instance-notebook.cfg.in
software/ipython_notebook/instance-notebook.cfg.in
+9
-9
software/ipython_notebook/instance.cfg
software/ipython_notebook/instance.cfg
+3
-2
software/ipython_notebook/software.cfg
software/ipython_notebook/software.cfg
+8
-12
No files found.
software/ipython_notebook/instance-
ipython-
default.cfg.in
→
software/ipython_notebook/instance-default.cfg.in
View file @
76550efa
[buildout]
extends =
${template-ipythonnotebook:output}
parts =
request-ipythonnotebook
publish-connection-parameter
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[request-ipythonnotebook]
<= slap-connection
...
...
@@ -9,3 +14,8 @@ name = IPython Notebook
software-url = $${slap-connection:software-release-url}
software-type = notebook
return = url
sla-computer_guid = $${slap-connection:computer-id}
[publish-connection-parameter]
recipe = slapos.cookbook:publish
notebook_url = $${request-ipythonnotebook:connection-url}
\ No newline at end of file
software/ipython_notebook/instance-
ipython-
notebook.cfg.in
→
software/ipython_notebook/instance-notebook.cfg.in
View file @
76550efa
...
...
@@ -32,15 +32,6 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[slapconfiguration]
recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
configuration.erp5_url = https://softinst60318.host.vifib.net/erp5/Base_executePython
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
rendered = $${buildout:directory}/$${:filename}
...
...
@@ -54,6 +45,15 @@ context =
key slave_instance_list slap-parameters:slave-instance-list
$${:extra-context}
[slapconfiguration]
recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
configuration.erp5_url = https://softinst60318.host.vifib.net/erp5/Base_executePython
[instance-parameter]
port = 8888
host = $${slapconfiguration:ipv6-random}
...
...
software/ipython_notebook/instance.cfg
View file @
76550efa
[buildout]
parts =
switch-softwaretype
...
...
@@ -8,5 +9,5 @@ offline = true
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${default-template-ipythonnotebook:output}
notebook = ${template-ipythonnotebook:output}
\ No newline at end of file
default = ${instance-default:output}
notebook = ${instance-notebook:output}
\ No newline at end of file
software/ipython_notebook/software.cfg
View file @
76550efa
...
...
@@ -15,8 +15,8 @@ parts =
ipython_notebook
ipython_notebook_set_password
instance
template-ipython
notebook
default-template-ipythonnotebook
instance-
notebook
instance-default
[ipython_notebook]
; In the ipython notebook software, we use more eggs than in the minimal
...
...
@@ -53,19 +53,15 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/instance.cfg
[
template-ipythonnotebook
]
[
instance-default
]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-ipython-notebook.cfg.in
md5sum = 5ba2484c3550a3254d14fcf1ed5fa6f4
output = ${buildout:directory}/template-ipython-notebook.cfg
mode = 0644
url = ${:_profile_base_location_}/instance-default.cfg.in
output = ${buildout:directory}/template-default.cfg
[
default-template-ipython
notebook]
[
instance-
notebook]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-ipython-default.cfg.in
md5sum = 9150cb3e60dddcde8060d04911e82323
output = ${buildout:directory}/temlate-ipython-default.cfg.in
mode = 0644
url = ${:_profile_base_location_}/instance-notebook.cfg.in
output = ${buildout:directory}/template-notebook.cfg
[erp5-kernel]
recipe = hexagonit.recipe.download
...
...
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