openstack/manila-image-elements
Code Issues Proposed changes

Update fetch-public-ssh-keys.sh

Browse Source 
Increase timeout and exit on error.
This commit is contained in:
Igor Malinovskiy 2015-06-05 13:56:29 +03:00
parent 62b4ccb392
commit 36ff48082d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/manila-ssh/install.d/fetch-public-ssh-keys.sh
View File

@ -13,7 +13,7 @@ if [ ! -d $MANILA_USER_SSH_DIR ]; then
fi fi
# Fetch public key using HTTP # Fetch public key using HTTP
ATTEMPTS=30 ATTEMPTS=60 # Wait up to 5 minutes
FAILED=0 FAILED=0
while [ ! -f $MANILA_USER_SSH_DIR/authorized_keys ]; do while [ ! -f $MANILA_USER_SSH_DIR/authorized_keys ]; do
curl -f http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/metadata-key 2>/dev/null curl -f http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/metadata-key 2>/dev/null
@ -32,7 +32,7 @@ while [ ! -f $MANILA_USER_SSH_DIR/authorized_keys ]; do
FAILED=`expr $FAILED + 1` FAILED=`expr $FAILED + 1`
if [ $FAILED -ge $ATTEMPTS ]; then if [ $FAILED -ge $ATTEMPTS ]; then
echo "Failed to retrieve public key from instance metadata after $FAILED attempts, quitting" echo "Failed to retrieve public key from instance metadata after $FAILED attempts, quitting"
break exit 1
fi fi
echo "Could not retrieve public key from instance metadata (attempt #$FAILED/$ATTEMPTS), retrying in 5 seconds..." echo "Could not retrieve public key from instance metadata (attempt #$FAILED/$ATTEMPTS), retrying in 5 seconds..."
sleep 5 sleep 5