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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
0bbc9a86
Commit
0bbc9a86
authored
Dec 13, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: correctly order the extends
parent
1344f1d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+3
-3
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+2
-2
software/slaprunner/instance-runner-import.cfg.in
software/slaprunner/instance-runner-import.cfg.in
+3
-3
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
No files found.
software/slaprunner/buildout.hash.cfg
View file @
0bbc9a86
...
...
@@ -18,7 +18,7 @@ md5sum = f0cab61c7b8478afb8b676fc725d50d5
[template-runner]
filename = instance-runner.cfg
md5sum =
a897ae4e90696516c4a6f831999f2c34
md5sum =
2332395fe59e450f02d7c9ba2b40348a
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
...
...
@@ -26,11 +26,11 @@ md5sum = ed6dc50713c14e2527b9958d98674eed
[instance-runner-import]
filename = instance-runner-import.cfg.in
md5sum =
1ed9526a6e5ac9a80e5b3add2d0a88fe
md5sum =
7a703358481fc1912019bb9deabd2410
[instance-runner-export]
filename = instance-runner-export.cfg.in
md5sum =
7f87e6d220934eb13ab2b5d67dca8922
md5sum =
6f99d36908e0327e069872a8443f91bc
[template-resilient]
filename = instance-resilient.cfg.jinja2
...
...
software/slaprunner/instance-runner-export.cfg.in
View file @
0bbc9a86
[buildout]
extends = {{
template_runner
_path }}
{{
pbsready_export_template
_path }}
extends = {{
pbsready_export_template
_path }}
{{
template_runner
_path }}
parts +=
nginx_conf
...
...
software/slaprunner/instance-runner-import.cfg.in
View file @
0bbc9a86
[buildout]
extends = {{
template_runner
_path }}
{{
pbsready_import_template
_path }}
extends = {{
pbsready_import_template
_path }}
{{
template_runner
_path }}
parts +=
nginx_conf
...
...
@@ -35,7 +35,7 @@ parts +=
resilient-software-release-information
# have to repeat the next one, as it's not inherited from pbsready-import
import-on-notification
#
import-on-notification
monitor-base
...
...
software/slaprunner/instance-runner.cfg
View file @
0bbc9a86
[buildout]
parts =
parts
+
=
nginx_conf
nginx-launcher
certificate-authority
...
...
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