Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
7437d1f4
Commit
7437d1f4
authored
Mar 27, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: instance-info-parameters section was removed
parent
47644132
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
stack/resilient/buildout.hash.cfg
stack/resilient/buildout.hash.cfg
+2
-2
stack/resilient/instance-pull-backup.cfg.in
stack/resilient/instance-pull-backup.cfg.in
+2
-2
stack/resilient/pbsready.cfg.in
stack/resilient/pbsready.cfg.in
+1
-1
No files found.
stack/resilient/buildout.hash.cfg
View file @
7437d1f4
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# not need these here).
# not need these here).
[pbsready]
[pbsready]
filename = pbsready.cfg.in
filename = pbsready.cfg.in
md5sum =
bceb082deb6b3ee9b015c8b04436b52c
md5sum =
367f8b8a09c3098844739f9b2856b912
[pbsready-import]
[pbsready-import]
filename = pbsready-import.cfg.in
filename = pbsready-import.cfg.in
...
@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
...
@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
[template-pull-backup]
[template-pull-backup]
filename = instance-pull-backup.cfg.in
filename = instance-pull-backup.cfg.in
md5sum =
5f35d9c0d08a268ed0c0f0dbef114f42
md5sum =
85e777bd349a5c881d36e747882aee8a
[template-replicated]
[template-replicated]
filename = template-replicated.cfg.in
filename = template-replicated.cfg.in
...
...
stack/resilient/instance-pull-backup.cfg.in
View file @
7437d1f4
...
@@ -136,13 +136,13 @@ notifier-url = http://[$${notifier:host}]:$${notifier:port}
...
@@ -136,13 +136,13 @@ notifier-url = http://[$${notifier:host}]:$${notifier:port}
slave-instance-list = $${slap-parameter:slave_instance_list}
slave-instance-list = $${slap-parameter:slave_instance_list}
ignore-known-hosts-file = $${slap-parameter:ignore-known-hosts-file}
ignore-known-hosts-file = $${slap-parameter:ignore-known-hosts-file}
# To get a verbose feed about PBS state
# To get a verbose feed about PBS state
instance-root-name = $${
instance-info-parameters:root-nam
e}
instance-root-name = $${
monitor-instance-parameter:root-instance-titl
e}
log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/
log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/
status-item-directory = $${directory:notifier-status-items}
status-item-directory = $${directory:notifier-status-items}
[pbs-resilient-status-feed]
[pbs-resilient-status-feed]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${buildout:directory}/bin/generatefeed --output $${:feed-path} --status-item-path $${pbs:status-item-directory} --title "Status feed for $${
instance-info-parameters:root-nam
e}-PBS" --link $${pbs:log-url}
command-line = ${buildout:directory}/bin/generatefeed --output $${:feed-path} --status-item-path $${pbs:status-item-directory} --title "Status feed for $${
monitor-instance-parameter:root-instance-titl
e}-PBS" --link $${pbs:log-url}
feed-path = $${directory:monitor-resilient}/pbs-status-rss
feed-path = $${directory:monitor-resilient}/pbs-status-rss
wrapper-path = $${rootdirectory:bin}/resilient-genstatusrss.py
wrapper-path = $${rootdirectory:bin}/resilient-genstatusrss.py
...
...
stack/resilient/pbsready.cfg.in
View file @
7437d1f4
...
@@ -135,7 +135,7 @@ command = ${buildout:bin-directory}/pubsubserver --callbacks $${directory:notifi
...
@@ -135,7 +135,7 @@ command = ${buildout:bin-directory}/pubsubserver --callbacks $${directory:notifi
notifier-binary = ${buildout:bin-directory}/pubsubnotifier
notifier-binary = ${buildout:bin-directory}/pubsubnotifier
host = $${slap-network-information:global-ipv6}
host = $${slap-network-information:global-ipv6}
port = $${notifier-port:port}
port = $${notifier-port:port}
instance-root-name = $${
instance-info-parameters:root-nam
e}
instance-root-name = $${
monitor-instance-parameter:root-instance-titl
e}
log-url = $${monitor-publish-parameters:monitor-base-url}/resilient/notifier-status-rss
log-url = $${monitor-publish-parameters:monitor-base-url}/resilient/notifier-status-rss
status-item-directory = $${directory:notifier-status-items}
status-item-directory = $${directory:notifier-status-items}
context =
context =
...
...
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