diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg index 0aaeb439d7f887623f89048b5ecf7fe9428e4776..c08ff615f4c2be96b100fadac66e5a5271fa7b58 100644 --- a/stack/resilient/buildout.cfg +++ b/stack/resilient/buildout.cfg @@ -53,7 +53,7 @@ mode = 0644 [template-replicated] recipe = slapos.recipe.download url = ${:_profile_base_location_}/template-replicated.cfg.in -md5sum = 589065f6df3b15df08afcb812f869fcf +md5sum = 9e20f283bf709c63c9c6692d5e1f8972 mode = 0644 destination = ${buildout:directory}/template-replicated.cfg.in diff --git a/stack/resilient/template-replicated.cfg.in b/stack/resilient/template-replicated.cfg.in index e7c82e9835c8026c99daa448ae04cc6da9f94510..9fe0fc6281da3f48f67a4333f8a84a9a9a833410 100644 --- a/stack/resilient/template-replicated.cfg.in +++ b/stack/resilient/template-replicated.cfg.in @@ -7,6 +7,9 @@ config-namebase = {{namebase}} software-url = ${slap-connection:software-release-url} ## Every request is double to provide the 3 IPs. +## First, we request with ip-list parameter hardcoded. +## Then, we request the same thing without this. +## XXX-Cedric: is it useful? [request-{{namebase}}] <= resilient slap-connection @@ -53,48 +56,13 @@ sla-computer_guid = ${slap-parameter:{{namebase}}{{id}}-computer-guid} config-ip-list = ${request-{{namebase}}:connection-ip}{% for j in range(1,nbbackup|int) %} ${request-{{namebase}}-pseudo-replicating-{{j}}:connection-ip}{% endfor %} [request-{{namebase}}-2] -<= resilient - slap-connection +<= request-{{namebase}} iplist - {{heriteLeader}} - -recipe = slapos.cookbook:request -name = {{namebase}}0 - -software-url = ${slap-connection:software-release-url} -software-type = {{typeexport}} -return = ssh-public-key ssh-url notification-id ip - -config = number authorized-key notify ip-list namebase -config-number = 0 -config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %} -config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %} - {% for id in range(1,nbbackup|int) %} [request-{{namebase}}-pseudo-replicating-{{id}}-2] -<= slap-connection - resilient +<= request-{{namebase}}-pseudo-replicating-{{id}} iplist - {{heriteBackup}} - -recipe = slapos.cookbook:request -name = {{namebase}}{{id}} - -software-url = ${slap-connection:software-release-url} -software-type = {{typeimport}} -return = ssh-public-key ssh-url notification-url - -pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-push - -config = number authorized-key on-notification ip-list namebase -config-number = {{id}} -config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key} -config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id} - -sla = computer_guid -sla-computer_guid = ${slap-parameter:{{namebase}}{{id}}-computer-guid} - {% endfor %}