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
Tristan Cavelier
slapos
Commits
028c26cb
Commit
028c26cb
authored
Aug 24, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix publish information section name
parent
97c45d30
Changes
3
Show 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-resilient.cfg.jinja2
software/slaprunner/instance-resilient.cfg.jinja2
+2
-2
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+2
-2
No files found.
software/slaprunner/common.cfg
View file @
028c26cb
...
@@ -81,13 +81,13 @@ mode = 0644
...
@@ -81,13 +81,13 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-export.cfg.in
url = ${:_profile_base_location_}/instance-runner-export.cfg.in
output = ${buildout:directory}/instance-runner-export.cfg
output = ${buildout:directory}/instance-runner-export.cfg
md5sum =
ae0851bf632aa932173024106f5b1bdf
md5sum =
994e355d713f90bcc17e4b54da65f354
mode = 0644
mode = 0644
[template-resilient]
[template-resilient]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
md5sum =
489cfdbe128c21ff5847f92d804fe460
md5sum =
aa9a99235571729ab93360c4712efa12
filename = instance-resilient.cfg.jinja2
filename = instance-resilient.cfg.jinja2
mode = 0644
mode = 0644
...
...
software/slaprunner/instance-resilient.cfg.jinja2
View file @
028c26cb
...
@@ -22,7 +22,7 @@ offline = true
...
@@ -22,7 +22,7 @@ offline = true
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
parts +=
parts +=
{{ parts.replicate("runner", number_of_instances + 1) }}
{{ parts.replicate("runner", number_of_instances + 1) }}
publish-connection-information
s
publish-connection-information
{{ replicated.replicate("runner", number_of_instances + 1, "runner-export", "runner-import", slapparameter_dict=slapparameter_dict) }}
{{ replicated.replicate("runner", number_of_instances + 1, "runner-export", "runner-import", slapparameter_dict=slapparameter_dict) }}
...
@@ -30,7 +30,7 @@ parts +=
...
@@ -30,7 +30,7 @@ parts +=
[request-runner]
[request-runner]
return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url monitor_backend_url webdav_url public_url git_public_url git_private_url
return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url monitor_backend_url webdav_url public_url git_public_url git_private_url
[publish-connection-information
s
]
[publish-connection-information]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
1_info = ${request-runner:connection-1_info}
1_info = ${request-runner:connection-1_info}
2_info = ${request-runner:connection-2_info}
2_info = ${request-runner:connection-2_info}
...
...
software/slaprunner/instance-runner-export.cfg.in
View file @
028c26cb
...
@@ -12,7 +12,7 @@ parts +=
...
@@ -12,7 +12,7 @@ parts +=
sshkeys-dropbear-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
dropbear-server-add-authorized-key
sshkeys-authority
sshkeys-authority
publish-connection-information
s
publish-connection-information
slaprunner-promise
slaprunner-promise
slaprunner-frontend-promise
slaprunner-frontend-promise
slaprunner-supervisord-wrapper
slaprunner-supervisord-wrapper
...
@@ -69,7 +69,7 @@ context =
...
@@ -69,7 +69,7 @@ context =
url = $${monitor-frontend:config-url}/$${deploy-index-template:filename}
url = $${monitor-frontend:config-url}/$${deploy-index-template:filename}
# Extends publish section with resilient parameters
# Extends publish section with resilient parameters
[publish-connection-information
s
]
[publish-connection-information]
<= resilient-publish-connection-parameter
<= resilient-publish-connection-parameter
[monitor-check-resilient-feed-file]
[monitor-check-resilient-feed-file]
...
...
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