Disable explicit parameter publication in resilient stack.

So that we publish ony once, not twice.
parent 087da08c
......@@ -22,7 +22,7 @@ parts =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum = e09164eeb1577f460efa9b1dcb6cc6c3
md5sum = 9f4212a79f10bee8f6d75061943110e2
mode = 0644
[pbsready-import]
......@@ -31,7 +31,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
md5sum = eda0c1574d8991f4f9e08e3707c2b04b
md5sum = 1b1308fd39476d48b5ca13db48ea6dc9
mode = 0644
[pbsready-export]
......@@ -40,7 +40,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/pbsready-export.cfg
md5sum = dd56f9c74e580475a17a9afb1d220390
md5sum = 5d9e20c436fd307e8e4ab224a9a65792
mode = 0644
[template-pull-backup]
......
......@@ -2,9 +2,10 @@
extends = ${pbsready:output}
parts += cron-entry-backup
parts +=
cron-entry-backup
[urls]
[resilient-publish-connection-parameter]
notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-exporter:name}
[notifier-exporter]
......
......@@ -2,9 +2,11 @@
extends = ${pbsready:output}
parts += import-on-notification
parts +=
import-on-notification
resilient-publish-connection-parameter
[urls]
[resilient-publish-connection-parameter]
notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
[import-on-notification]
......
......@@ -2,7 +2,6 @@
parts =
resiliency
urls
logrotate
logrotate-entry-cron
logrotate-entry-equeue
......@@ -145,11 +144,6 @@ etc = $${rootdirectory:etc}
#--
#-- Sets up an rdiff-backup server (with a dropbear server for ssh)
[urls]
ssh-public-key = $${sshkeys-dropbear:public-key-value}
ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
[rdiff-backup-server]
recipe = slapos.cookbook:pbs
client = false
......@@ -232,4 +226,12 @@ recipe = slapos.cookbook:dropbear.add_authorized_key
key = $${slap-parameter:authorized-key}
#----------------
#--
#-- Conncetion informations to re-use.
# XXX-Cedric: when "aggregation" system is done in libslap, directly publish.
[resilient-publish-connection-parameter]
recipe = slapos.cookbook:publish
ssh-public-key = $${sshkeys-dropbear:public-key-value}
ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
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