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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
be725543
Commit
be725543
authored
Apr 11, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/resilience: Fixup after change to buildout.hash.cfg
parent
fe5cd45b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
12 deletions
+9
-12
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance.cfg.in
software/kvm/instance.cfg.in
+2
-2
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance.cfg
software/slaprunner/instance.cfg
+3
-3
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+0
-3
stack/resilient/buildout.hash.cfg
stack/resilient/buildout.hash.cfg
+1
-1
stack/resilient/pbsready-import.cfg.in
stack/resilient/pbsready-import.cfg.in
+1
-1
No files found.
software/kvm/common.cfg
View file @
be725543
...
...
@@ -87,7 +87,7 @@ command =
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
md5sum =
061604d32cc626352dc3d221bdeaf804
md5sum =
d71c718cd5c4c17087bfa44684b7db47
output = ${buildout:directory}/template.cfg
mode = 0644
...
...
software/kvm/instance.cfg.in
View file @
be725543
...
...
@@ -106,8 +106,8 @@ context =
raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
raw template_monitor ${monitor2-template:rendered}
raw websockify_executable_location ${buildout:directory}/bin/websockify
template-parts-destination = ${template-parts:
destination
}
template-replicated-destination = ${template-replicated:
destination
}
template-parts-destination = ${template-parts:
target
}
template-replicated-destination = ${template-replicated:
target
}
import-list = file parts :template-parts-destination
file replicated :template-replicated-destination
mode = 0644
...
...
software/slaprunner/buildout.hash.cfg
View file @
be725543
...
...
@@ -15,7 +15,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum =
06107f93ebe78905c957a4c4fc4edf16
md5sum =
80aa32f7b691296b688a469e776db5b5
[template-runner]
filename = instance-runner.cfg
...
...
software/slaprunner/instance.cfg
View file @
be725543
...
...
@@ -42,8 +42,8 @@ context = key buildout buildout:bin-directory
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
key slapparameter_dict slap-configuration:configuration
template-parts-destination = ${template-parts:
destination
}
template-replicated-destination = ${template-replicated:
destination
}
template-parts-destination = ${template-parts:
target
}
template-replicated-destination = ${template-replicated:
target
}
import-list = file parts :template-parts-destination
file replicated :template-replicated-destination
mode = 0644
...
...
@@ -80,4 +80,4 @@ computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
\ No newline at end of file
cert = $${slap-connection:cert-file}
stack/resilient/buildout.cfg
View file @
be725543
...
...
@@ -69,13 +69,11 @@ mode = 0644
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/template-replicated.cfg.in
mode = 0644
destination = ${buildout:directory}/template-replicated.cfg.in
[template-parts]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/template-parts.cfg.in
mode = 0644
destination = ${buildout:directory}/template-parts.cfg.in
[template-resilient-templates]
recipe = slapos.recipe.template
...
...
@@ -96,7 +94,6 @@ output = ${buildout:directory}/instance-frozen.cfg
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/resilient-web-takeover-cgi-script.py.in
mode = 0644
destination = ${buildout:directory}/resilient-web-takeover-cgi-script.py.in
# Provide an empty wrapper
[template-wrapper]
...
...
stack/resilient/buildout.hash.cfg
View file @
be725543
...
...
@@ -19,7 +19,7 @@ md5sum = 809f4b0b3c4976b3dae8d579f6daa615
[pbsready-import]
filename = pbsready-import.cfg.in
md5sum =
af85dfe8d281f3458be3de46f8e6a2b4
md5sum =
1a31882707732f224e014c1b744df177
[pbsready-export]
filename = pbsready-export.cfg.in
...
...
stack/resilient/pbsready-import.cfg.in
View file @
be725543
...
...
@@ -125,7 +125,7 @@ bytes = 8
[resilient-web-takeover-cgi-script]
recipe = collective.recipe.template
input = ${resilient-web-takeover-cgi-script-download:
destination
}
input = ${resilient-web-takeover-cgi-script-download:
target
}
output = $${directory:cgi-bin}/web-takeover.cgi
password = $${resilient-web-takeover-password:passwd}
mode = 700
...
...
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