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
Stephane VAROQUI
slapos
Commits
fd805805
Commit
fd805805
authored
Sep 12, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner : is now deployed by buildout
instead of a recipe
parent
c4a50163
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
9 deletions
+26
-9
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/__init__.py
+3
-3
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+8
-4
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+14
-2
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+1
-0
No files found.
slapos/recipe/slaprunner/__init__.py
View file @
fd805805
...
@@ -76,9 +76,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -76,9 +76,9 @@ class Recipe(GenericBaseRecipe):
cloud9_url
=
self
.
cloud9_url
cloud9_url
=
self
.
cloud9_url
)
)
#
config_file = self.createFile(self.options['slapos.cfg'],
config_file
=
self
.
createFile
(
self
.
options
[
'slapos.cfg'
],
#
self.substituteTemplate(self.getTemplateFilename('slapos.cfg.in'),
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'slapos.cfg.in'
),
#
configuration))
configuration
))
config_file
=
configuration
[
'etc_dir'
]
+
'slapos.cfg'
config_file
=
configuration
[
'etc_dir'
]
+
'slapos.cfg'
environment
=
dict
(
environment
=
dict
(
...
...
software/slaprunner/common.cfg
View file @
fd805805
...
@@ -81,14 +81,14 @@ command =
...
@@ -81,14 +81,14 @@ command =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
#md5sum = 92a2f3bcd5ff79e3b61ca4a8bacb73ec
md5sum = 488af385149e4ead6f93d411cda93475
mode = 0644
mode = 0644
[template-runner]
[template-runner]
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
output = ${buildout:directory}/template-runner.cfg
md5sum =
57b819ac075ac1114313f0461a7d2ae7
md5sum =
646415d5e17cd46aa1362e01d76bdff5
mode = 0644
mode = 0644
[instance-runner-import]
[instance-runner-import]
...
@@ -115,7 +115,7 @@ mode = 0644
...
@@ -115,7 +115,7 @@ mode = 0644
[template-resilient-test]
[template-resilient-test]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
md5sum =
ac772d3a1cce4072acfabd563df449bb
md5sum =
bb7ec7c44bc38b903092307e9751f917
filename = instance-resilient-test.cfg.jinja2
filename = instance-resilient-test.cfg.jinja2
mode = 0644
mode = 0644
...
@@ -137,7 +137,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -137,7 +137,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template]
[slapos-cfg-template]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
url = ${:_profile_base_location_}/template/${:filename}
#md5sum =
md5sum = 93f674a0c0d88b6d06d44b46b3643baf
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in.j2
filename = slapos.cfg.in.j2
download-only = true
download-only = true
...
@@ -159,6 +159,7 @@ eggs =
...
@@ -159,6 +159,7 @@ eggs =
slapos.core
slapos.core
xml_marshaller
xml_marshaller
pytz
pytz
<<<<<<< HEAD
# Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache
# Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache
[slapos-cookbook]
[slapos-cookbook]
...
@@ -177,3 +178,6 @@ eggs =
...
@@ -177,3 +178,6 @@ eggs =
pytz
pytz
slapos.libnetworkcache
slapos.libnetworkcache
=======
collective.recipe.environment
>>>>>>> 3bf4e1a... slaprunner : is now deployed by buildout
software/slaprunner/instance-runner.cfg
View file @
fd805805
...
@@ -6,7 +6,6 @@ parts =
...
@@ -6,7 +6,6 @@ parts =
certificate-authority
certificate-authority
ca-nginx
ca-nginx
ca-node-frontend
ca-node-frontend
slaprunner
test-runner
test-runner
sshkeys-dropbear-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
dropbear-server-add-authorized-key
...
@@ -21,7 +20,9 @@ parts =
...
@@ -21,7 +20,9 @@ parts =
request-cloud9-frontend
request-cloud9-frontend
node-frontend-promise
node-frontend-promise
nginx-promise
nginx-promise
environ
slapos-cfg
slapos-cfg
slaprunner-wrapper
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
@@ -80,7 +81,6 @@ node-binary = ${nodejs:location}/bin/node
...
@@ -80,7 +81,6 @@ node-binary = ${nodejs:location}/bin/node
cloud9 = ${cloud9:executable}
cloud9 = ${cloud9:executable}
[slaprunner]
[slaprunner]
recipe = slapos.cookbook:slaprunner
slaprunner = ${buildout:directory}/bin/slaprunner
slaprunner = ${buildout:directory}/bin/slaprunner
slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
...
@@ -106,6 +106,7 @@ partition-amount = $${slap-parameter:instance-amount}
...
@@ -106,6 +106,7 @@ partition-amount = $${slap-parameter:instance-amount}
cloud9-url = $${cloud9:access-url}
cloud9-url = $${cloud9:access-url}
wrapper = $${directory:services}/slaprunner
wrapper = $${directory:services}/slaprunner
debug = $${slap-parameter:debug}
debug = $${slap-parameter:debug}
access-url = https://[$${:ipv6}]:$${:runner_port}
[test-runner]
[test-runner]
<= slaprunner
<= slaprunner
...
@@ -426,3 +427,14 @@ context =
...
@@ -426,3 +427,14 @@ context =
key cloud9_url slaprunner:cloud9-url
key cloud9_url slaprunner:cloud9-url
key run_dir slaprunner:run_dir
key run_dir slaprunner:run_dir
key log_dir slaprunner:log_dir
key log_dir slaprunner:log_dir
[environ]
recipe = collective.recipe.environment
[slaprunner-wrapper]
recipe = slapos.cookbook:wrapper
command-line = $${slaprunner:slaprunner} $${slaprunner:slapos.cfg} --log_file $${:log-file}
log-file = $${slaprunner:log_dir}/slaprunner.log
wrapper-path = $${slaprunner:wrapper}
environment = PATH=$${slaprunner:git-binary}:$${environ:PATH}
GIT_SSH=$${slaprunner:ssh_client}
software/slaprunner/software.cfg
View file @
fd805805
...
@@ -75,6 +75,7 @@ cliff = 1.4
...
@@ -75,6 +75,7 @@ cliff = 1.4
cmd2 = 0.6.6
cmd2 = 0.6.6
prettytable = 0.7.2
prettytable = 0.7.2
requests = 1.2.3
requests = 1.2.3
collective.recipe.environment = 0.2.0
# Required by:
# Required by:
# slapos.core==0.34
# slapos.core==0.34
# slapos.toolbox==0.34.0
# slapos.toolbox==0.34.0
...
...
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