mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-4138: keep the existing changes in cloud-set-guest-sshkey.in to make sure we do not break the backward compatibility
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
This commit is contained in:
parent
9807f86619
commit
35d20d163d
@ -26,17 +26,48 @@
|
|||||||
# Modify this line to specify the user (default is root)
|
# Modify this line to specify the user (default is root)
|
||||||
user=root
|
user=root
|
||||||
|
|
||||||
SSHKEY_SERVER_IP=$(nslookup data-server | grep Server | awk '{print $2}')
|
# Add your DHCP lease folders here
|
||||||
|
DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/*"
|
||||||
|
keys_received=0
|
||||||
|
file_count=0
|
||||||
|
|
||||||
|
for DHCP_FILE in $DHCP_FOLDERS
|
||||||
|
do
|
||||||
|
if [ -f $DHCP_FILE ]
|
||||||
|
then
|
||||||
|
file_count=$((file_count+1))
|
||||||
|
SSHKEY_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;')
|
||||||
|
|
||||||
|
if [ -n "$SSHKEY_SERVER_IP" ]
|
||||||
|
then
|
||||||
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
||||||
|
|
||||||
publickey=$(wget -t 3 -T 20 -O - http://data-server/latest/public-keys 2>/dev/null)
|
publickey=$(wget -t 3 -T 20 -O - http://$SSHKEY_SERVER_IP/latest/public-keys 2>/dev/null)
|
||||||
|
|
||||||
if [ $? -eq 0 ]
|
if [ $? -eq 0 ]
|
||||||
then
|
then
|
||||||
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
||||||
keys_received=1
|
keys_received=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
logger -t "cloud" "Could not find ssh key server IP in $DHCP_FILE"
|
logger -t "cloud" "Could not find ssh key server IP in $DHCP_FILE trying with the name data-server "
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$keys_received" == "0" ]
|
||||||
|
then
|
||||||
|
SSHKEY_SERVER_IP=$(nslookup data-server | grep Address |tr '\n' ' '| awk '{print $4}')
|
||||||
|
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
||||||
|
publickey=$(wget -t 3 -T 20 -O - http://data-server/latest/public-keys 2>/dev/null)
|
||||||
|
if [ $? -eq 0 ]
|
||||||
|
then
|
||||||
|
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
||||||
|
keys_received=1
|
||||||
|
else
|
||||||
|
logger -t "cloud" "Could not resolve the name data-server"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# did we find the keys anywhere?
|
# did we find the keys anywhere?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user