Commit 2e9d103d authored by Hardik Juneja's avatar Hardik Juneja

fixes pbsready monitor issue

parent 8437fa5d
...@@ -27,7 +27,7 @@ md5sum = 130193114cbbcd014af9704851410605 ...@@ -27,7 +27,7 @@ md5sum = 130193114cbbcd014af9704851410605
[instance-runner-import] [instance-runner-import]
filename = instance-runner-import.cfg.in filename = instance-runner-import.cfg.in
md5sum = 5cfa49bcf20612844e1c50a85740d0b3 md5sum = 58ceb151dcc7e89d29612bcd94efe2e4
[template-runner-export-script] [template-runner-export-script]
filename = template/runner-export.sh.jinja2 filename = template/runner-export.sh.jinja2
......
...@@ -72,6 +72,9 @@ maximum = 22241 ...@@ -72,6 +72,9 @@ maximum = 22241
[cron-entry-prepare-software] [cron-entry-prepare-software]
recipe = recipe =
[notifier]
log-url = ${monitor-publish-parameters:monitor-base-url}/resilient/notifier-status-rss
[importer] [importer]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ importer_script_path }} template = {{ importer_script_path }}
......
...@@ -83,7 +83,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -83,7 +83,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 03983ea97d53e40bf3caf3d6744e1137 md5sum = ba6ca56058bfb061ff04e3a46c6a60db
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
...@@ -91,7 +91,7 @@ md5sum = 0da85c80c47b5f05a2cbd3b0bf0b111d ...@@ -91,7 +91,7 @@ md5sum = 0da85c80c47b5f05a2cbd3b0bf0b111d
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = md5sum = a6da3009d8c9b23aacfdc89ff08c6e2b
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -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 = ec11a0d1df5d5014f9004e88b1df1b79 md5sum = 6469cefecfeac19bf1f7cd26ab89c278
[pbsready-import] [pbsready-import]
filename = pbsready-import.cfg.in filename = pbsready-import.cfg.in
......
...@@ -18,6 +18,10 @@ parts += ...@@ -18,6 +18,10 @@ parts +=
sshd-pbs-authorized-key sshd-pbs-authorized-key
notifier notifier
#----------------
#--
#-- Creation of all needed directories.
[rootdirectory] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc etc = $${buildout:directory}/etc
...@@ -36,6 +40,7 @@ promises = $${rootdirectory:etc}/promise ...@@ -36,6 +40,7 @@ promises = $${rootdirectory:etc}/promise
services = $${rootdirectory:etc}/service services = $${rootdirectory:etc}/service
cache = $${rootdirectory:var}/cache cache = $${rootdirectory:var}/cache
notifier = $${rootdirectory:etc}/notifier notifier = $${rootdirectory:etc}/notifier
monitor = $${rootdirectory:srv}/monitor
[directory] [directory]
...@@ -52,8 +57,8 @@ cronstamps = $${rootdirectory:etc}/cronstamps ...@@ -52,8 +57,8 @@ cronstamps = $${rootdirectory:etc}/cronstamps
logrotate-entries = $${rootdirectory:etc}/logrotate.d logrotate-entries = $${rootdirectory:etc}/logrotate.d
logrotate-backup = $${basedirectory:backup}/logrotate logrotate-backup = $${basedirectory:backup}/logrotate
cgi-bin = $${rootdirectory:srv}/cgi-bin cgi-bin = $${rootdirectory:srv}/cgi-bin
monitor-resilient = $${monitor-directory:private}/resilient private = $${basedirectory:monitor}/private
monitor-resilient = $${:private}/resilient
[slap-parameter] [slap-parameter]
authorized-key = authorized-key =
...@@ -129,7 +134,6 @@ notifier-binary = ${buildout:bin-directory}/pubsubnotifier ...@@ -129,7 +134,6 @@ 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-name} instance-root-name = $${instance-info-parameters:root-name}
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 =
key content notifier:command key content notifier:command
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment