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
Boxiang Sun
slapos
Commits
046b4cb7
Commit
046b4cb7
authored
Jul 20, 2015
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: allow to configure the window title by using 'instance-name' parameter
This required slapos.toolbox 0.50
parent
a6bc100e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
12 deletions
+19
-12
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-runner-input-schema.json
software/slaprunner/instance-runner-input-schema.json
+5
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-0
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+9
-9
software/slaprunner/template/slapos.cfg.in
software/slaprunner/template/slapos.cfg.in
+1
-0
No files found.
software/slaprunner/common.cfg
View file @
046b4cb7
...
@@ -50,7 +50,7 @@ mode = 0644
...
@@ -50,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
a1f8613ca1da30ec50a51fcb03d44a1
5
md5sum =
d1913d1e0f1f3d3b1c362979888af02
5
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -125,7 +125,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -125,7 +125,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template-slapos-cfg]
[template-slapos-cfg]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
url = ${:_profile_base_location_}/template/${:filename}
md5sum =
c490563b831fc959a09b4b233263a6c6
md5sum =
f406b91c5b0261b198a1c1930c195071
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in
filename = slapos.cfg.in
download-only = true
download-only = true
...
...
software/slaprunner/instance-runner-input-schema.json
View file @
046b4cb7
...
@@ -109,6 +109,10 @@
...
@@ -109,6 +109,10 @@
"description"
:
"Number of clones to be deployed when a resilient runner, if missing a single clone is provided. Its value can be 1 or 2"
,
"description"
:
"Number of clones to be deployed when a resilient runner, if missing a single clone is provided. Its value can be 1 or 2"
,
"type"
:
"integer"
,
"type"
:
"integer"
,
"enum"
:
[
1
,
2
]
"enum"
:
[
1
,
2
]
}
},
"instance-name"
:
{
"description"
:
"Name of the instance, to show in the window title"
,
"type"
:
"string"
},
}
}
}
}
software/slaprunner/instance-runner.cfg
View file @
046b4cb7
...
@@ -185,6 +185,7 @@ minishell_history_file = $${directory:etc}/.minishell_history
...
@@ -185,6 +185,7 @@ minishell_history_file = $${directory:etc}/.minishell_history
software_info_json = $${runnerdirectory:home}/software_info.json
software_info_json = $${runnerdirectory:home}/software_info.json
instance_info_json = $${runnerdirectory:home}/instance_info.json
instance_info_json = $${runnerdirectory:home}/instance_info.json
path = $${shell:path}
path = $${shell:path}
instance_name = $${slap-parameter:instance-name}
#---------------------------
#---------------------------
...
@@ -496,6 +497,7 @@ auto-deploy = false
...
@@ -496,6 +497,7 @@ auto-deploy = false
auto-deploy-instance = true
auto-deploy-instance = true
autorun = false
autorun = false
monitor-port = 9684
monitor-port = 9684
instance-name =
[monitor-parameters]
[monitor-parameters]
port = $${slap-parameter:monitor-port}
port = $${slap-parameter:monitor-port}
...
...
software/slaprunner/software.cfg
View file @
046b4cb7
...
@@ -21,16 +21,16 @@ plone.recipe.command = 1.1
...
@@ -21,16 +21,16 @@ plone.recipe.command = 1.1
pycrypto = 2.6.1
pycrypto = 2.6.1
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.7
slapos.recipe.template = 2.7
slapos.toolbox = 0.
48
slapos.toolbox = 0.
50
smmap = 0.9.0
smmap = 0.9.0
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
# Required by:
# Required by:
# slapos.toolbox==0.
48
# slapos.toolbox==0.
50
GitPython =
1.0.1
GitPython =
0.3.5
# Required by:
# Required by:
# slapos.toolbox==0.
48
# slapos.toolbox==0.
50
atomize = 0.2.0
atomize = 0.2.0
# Required by:
# Required by:
...
@@ -38,17 +38,17 @@ atomize = 0.2.0
...
@@ -38,17 +38,17 @@ atomize = 0.2.0
backports.ssl-match-hostname = 3.4.0.2
backports.ssl-match-hostname = 3.4.0.2
# Required by:
# Required by:
# slapos.toolbox==0.
48
# slapos.toolbox==0.
50
feedparser = 5.
2.0.post1
feedparser = 5.
1.3
# Required by:
# Required by:
# slapos.toolbox==0.
48
# slapos.toolbox==0.
50
lockfile = 0.10.2
lockfile = 0.10.2
# Required by:
# Required by:
# slapos.toolbox==0.
48
# slapos.toolbox==0.
50
paramiko = 1.15.2
paramiko = 1.15.2
# Required by:
# Required by:
# slapos.toolbox==0.
48
# slapos.toolbox==0.
50
rpdb = 0.1.5
rpdb = 0.1.5
software/slaprunner/template/slapos.cfg.in
View file @
046b4cb7
...
@@ -36,6 +36,7 @@ knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
...
@@ -36,6 +36,7 @@ knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
minishell_cwd_file = {{ slaprunner['minishell_cwd_file'] }}
minishell_cwd_file = {{ slaprunner['minishell_cwd_file'] }}
minishell_history_file = {{ slaprunner['minishell_history_file'] }}
minishell_history_file = {{ slaprunner['minishell_history_file'] }}
path = {{ slaprunner['path'] }}
path = {{ slaprunner['path'] }}
instance_name = {{ slaprunner['instance_name'] }}
[slapproxy]
[slapproxy]
host = {{ slaprunner['ipv4'] }}
host = {{ slaprunner['ipv4'] }}
...
...
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