Resilient stack: fix resilient promise.

parent 9d9dd6b6
...@@ -67,7 +67,7 @@ mode = 0644 ...@@ -67,7 +67,7 @@ mode = 0644
[template-replicated] [template-replicated]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/template-replicated.cfg.in url = ${:_profile_base_location_}/template-replicated.cfg.in
md5sum = 9e236726678d89a5359e1571a91e59e8 md5sum = 03138b7d60d7933a0ab5695a85772b25
mode = 0644 mode = 0644
destination = ${buildout:directory}/template-replicated.cfg.in destination = ${buildout:directory}/template-replicated.cfg.in
......
...@@ -131,7 +131,7 @@ recipe = collective.recipe.template ...@@ -131,7 +131,7 @@ recipe = collective.recipe.template
# XXX: don't use system executable # XXX: don't use system executable
input = inline:#!/bin/sh input = inline:#!/bin/sh
PUBLIC_KEY_CONTENT="${request-{{namebase}}-2:connection-ssh-public-key})" PUBLIC_KEY_CONTENT="${request-{{namebase}}-2:connection-ssh-public-key})"
if [[ ! -n "$PUBLIC_KEY_CONTENT" -o "$PUBLIC_KEY_CONTENT" == None ]]; then if [[ ! -n "$PUBLIC_KEY_CONTENT" && "$PUBLIC_KEY_CONTENT" == None ]]; then
exit 1 exit 1
fi fi
output = ${resilient-directory:promise}/resilient-request-{{namebase}}-public-key output = ${resilient-directory:promise}/resilient-request-{{namebase}}-public-key
...@@ -149,7 +149,7 @@ recipe = collective.recipe.template ...@@ -149,7 +149,7 @@ recipe = collective.recipe.template
# XXX: don't use system executable # XXX: don't use system executable
input = inline:#!/bin/sh input = inline:#!/bin/sh
PUBLIC_KEY_CONTENT="${request-{{namebase}}-pseudo-replicating-{{id}}-2:connection-ssh-public-key})" PUBLIC_KEY_CONTENT="${request-{{namebase}}-pseudo-replicating-{{id}}-2:connection-ssh-public-key})"
if [ ! -n "$PUBLIC_KEY_CONTENT" -a "$PUBLIC_KEY_CONTENT" == None ]; then if [ ! -n "$PUBLIC_KEY_CONTENT" && "$PUBLIC_KEY_CONTENT" == None ]; then
exit 1 exit 1
fi fi
output = ${resilient-directory:promise}/resilient-request-{{namebase}}-pseudo-replicating-{{id}}-public-key output = ${resilient-directory:promise}/resilient-request-{{namebase}}-pseudo-replicating-{{id}}-public-key
...@@ -207,7 +207,7 @@ recipe = collective.recipe.template ...@@ -207,7 +207,7 @@ recipe = collective.recipe.template
# XXX: don't use system executable # XXX: don't use system executable
input = inline:#!/bin/sh input = inline:#!/bin/sh
PUBLIC_KEY_CONTENT="${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}:connection-ssh-key})" PUBLIC_KEY_CONTENT="${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}:connection-ssh-key})"
if [ ! -n "$PUBLIC_KEY_CONTENT" -a "$PUBLIC_KEY_CONTENT" == None ]; then if [ ! -n "$PUBLIC_KEY_CONTENT" && "$PUBLIC_KEY_CONTENT" == None ]; then
exit 1 exit 1
fi fi
output = ${resilient-directory:promise}/resilient-request-{{namebase}}-pseudo-replicating-{{id}}-public-key output = ${resilient-directory:promise}/resilient-request-{{namebase}}-pseudo-replicating-{{id}}-public-key
......
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