openstack
/
project-config
Code Issues Proposed changes

Merge "Fix ZUUL_USER_SSH_PUBLIC_KEY to support ssh key content"

This commit is contained in:
Zuul 2018-05-01 17:45:31 +00:00 committed by Gerrit Code Review
parent e58ba46264 fa1e7d4097
commit 21fc2a8edf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nodepool/elements/zuul-worker/extra-data.d/60-zuul-user
View File

@ -8,9 +8,12 @@ set -o pipefail
ZUUL_USER_SSH_PUBLIC_KEY=${ZUUL_USER_SSH_PUBLIC_KEY:-$HOME/.ssh/id_rsa.pub}
if [ ! -f $ZUUL_USER_SSH_PUBLIC_KEY ]; then
if [ -f "$ZUUL_USER_SSH_PUBLIC_KEY" ]; then
# save the public key inside the chroot from specific file
cat $ZUUL_USER_SSH_PUBLIC_KEY >> $TMP_HOOKS_PATH/zuul-user-ssh-public-key
elif [ -n "$ZUUL_USER_SSH_PUBLIC_KEY" ]; then
# save the specific public key inside the chroot from env derectly
echo "$ZUUL_USER_SSH_PUBLIC_KEY" >> $TMP_HOOKS_PATH/zuul-user-ssh-public-key
else
die "Can not find public key for zuul user!"
fi
# save the public key inside the chroot
cat $ZUUL_USER_SSH_PUBLIC_KEY >> $TMP_HOOKS_PATH/zuul-user-ssh-public-key