Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
91c0eec3
Commit
91c0eec3
authored
Apr 27, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resilient stack: fix promise for checking public key content
parent
bf16d268
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
stack/resilient/buildout.hash.cfg
stack/resilient/buildout.hash.cfg
+1
-1
stack/resilient/template-replicated.cfg.in
stack/resilient/template-replicated.cfg.in
+6
-6
No files found.
stack/resilient/buildout.hash.cfg
View file @
91c0eec3
...
@@ -31,7 +31,7 @@ md5sum = 85e777bd349a5c881d36e747882aee8a
...
@@ -31,7 +31,7 @@ md5sum = 85e777bd349a5c881d36e747882aee8a
[template-replicated]
[template-replicated]
filename = template-replicated.cfg.in
filename = template-replicated.cfg.in
md5sum = 5
5ef107f499e5e604b8d277098618fed
md5sum = 5
369b039600e1df8b471ac4b41d5de60
[template-parts]
[template-parts]
filename = template-parts.cfg.in
filename = template-parts.cfg.in
...
...
stack/resilient/template-replicated.cfg.in
View file @
91c0eec3
...
@@ -140,8 +140,8 @@ takeover-{{namebase}}-{{id}}-password = ${request-{{namebase}}-pseudo-replicatin
...
@@ -140,8 +140,8 @@ takeover-{{namebase}}-{{id}}-password = ${request-{{namebase}}-pseudo-replicatin
# XXX: maybe we should consider empty values to be non-nexistent.
# XXX: maybe we should consider empty values to be non-nexistent.
recipe = collective.recipe.template
recipe = collective.recipe.template
# XXX: don't use system executable
# XXX: don't use system executable
input = inline:#!/bin/sh
input = inline:#!/bin/
ba
sh
PUBLIC_KEY_CONTENT="${request-{{namebase}}:connection-ssh-public-key}
)
"
PUBLIC_KEY_CONTENT="${request-{{namebase}}:connection-ssh-public-key}"
if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
exit 1
exit 1
fi
fi
...
@@ -155,8 +155,8 @@ mode = 700
...
@@ -155,8 +155,8 @@ mode = 700
# XXX: maybe we should consider empty values to be non-nexistent.
# XXX: maybe we should consider empty values to be non-nexistent.
recipe = collective.recipe.template
recipe = collective.recipe.template
# XXX: don't use system executable
# XXX: don't use system executable
input = inline:#!/bin/sh
input = inline:#!/bin/
ba
sh
PUBLIC_KEY_CONTENT="${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key}
)
"
PUBLIC_KEY_CONTENT="${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key}"
if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
exit 1
exit 1
fi
fi
...
@@ -217,8 +217,8 @@ sla-{{ key }} = {{ value }}
...
@@ -217,8 +217,8 @@ sla-{{ key }} = {{ value }}
# XXX: maybe we should consider empty values to be non-nexistent.
# XXX: maybe we should consider empty values to be non-nexistent.
recipe = collective.recipe.template
recipe = collective.recipe.template
# XXX: don't use system executable
# XXX: don't use system executable
input = inline:#!/bin/sh
input = inline:#!/bin/
ba
sh
PUBLIC_KEY_CONTENT="${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
:connection-ssh-key})
"
PUBLIC_KEY_CONTENT="${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}"
if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
if [[ ! -n "$PUBLIC_KEY_CONTENT" || "$PUBLIC_KEY_CONTENT" == *None* ]]; then
exit 1
exit 1
fi
fi
...
...
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