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
Lorenzo Martinico
slapos
Commits
ce06afb9
Commit
ce06afb9
authored
Mar 15, 2014
by
Nicolas Wavrant
Committed by
Cédric Le Ninivin
Apr 29, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: use slapos command instead of slapgrid
parent
a0ee5770
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-2
software/slaprunner/template/slapos.cfg.in
software/slaprunner/template/slapos.cfg.in
+2
-2
No files found.
software/slaprunner/common.cfg
View file @
ce06afb9
...
...
@@ -44,7 +44,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
569fc375fdf28c2ca8d40be9d6a4814c
md5sum =
61b4b0d386a6f893b26b1c508ac1d87e
mode = 0644
[instance-runner-import]
...
...
@@ -103,7 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
md5sum =
d215214357d68b63641818a39f9460b6
md5sum =
12cefe7c6265b983216bb6617aaf55dd
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in
download-only = true
...
...
software/slaprunner/instance-runner.cfg
View file @
ce06afb9
...
...
@@ -137,11 +137,11 @@ bytes = 8
[slaprunner]
slaprunner = ${buildout:directory}/bin/slaprunner
slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
slapos = ${buildout:directory}/bin/slapos
slapproxy = ${buildout:directory}/bin/slapproxy
supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
git-binary = ${git:location}/bin/git
root_check = false
slapos.cfg = $${directory:etc}/slapos.cfg
working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project}
...
...
software/slaprunner/template/slapos.cfg.in
View file @
ce06afb9
...
...
@@ -4,13 +4,13 @@ instance_root = {{ slaprunner['instance_root'] }}
master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
computer_id = slaprunner
maximal_delay = 0
root_check = {{ slaprunner['root_check'] }}
[slapformat]
partition_amount = {{ slaprunner['partition-amount'] }}
[slaprunner]
slapgrid_sr = {{ slaprunner['slapgrid_sr'] }}
slapgrid_cp = {{ slaprunner['slapgrid_cp'] }}
slapos = {{ slaprunner['slapos'] }}
slapproxy = {{ slaprunner['slapproxy'] }}
supervisor = {{ slaprunner['supervisor'] }}
supervisord_config = {{ slaprunner['supervisord_config'] }}
...
...
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