apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Both scripts should be able to use the data-server introduced in 4.4

Browse Source
This commit is contained in:
Hugo Trippaers 2014-11-28 14:08:47 +01:00
parent ce2b2a1fc7
commit ae0cb82792
2 changed files with 48 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
setup/bindir/cloud-set-guest-password.in
View File

@ -40,45 +40,44 @@ for DHCP_FILE in $DHCP_FOLDERS; do
if [ -n "$PASSWORD_SERVER_IP" ]; then
logger -t "cloud" "Found password server IP $PASSWORD_SERVER_IP in $DHCP_FILE"
logger -t "cloud" "Sending request to password server at $PASSWORD_SERVER_IP"
password=$(wget -q -t 3 -T 20 -O - --header "DomU_Request: send_my_password" $PASSWORD_SERVER_IP:$PASSWORD_SERVER_PORT)
if [ $? -eq 0 ]; then
password=$(echo $password | tr -d '\r')
logger -t "cloud" "Got response from server at $PASSWORD_SERVER_IP"
case $password in
"")
logger -t "cloud" "Password server at $PASSWORD_SERVER_IP did not have any password for the VM"
continue
;;
"bad_request")
logger -t "cloud" "VM sent an invalid request to password server at $PASSWORD_SERVER_IP"
error_count=$((error_count+1))
continue
;;
"saved_password")
logger -t "cloud" "VM has already saved a password from the password server at $PASSWORD_SERVER_IP"
continue
;;
*)
logger -t "cloud" "VM got a valid password from server at $PASSWORD_SERVER_IP"
password_received=1
break
;;
esac
else
logger -t "cloud" "Failed to send request to password server at $PASSWORD_SERVER_IP"
error_count=$((error_count+1))
fi
else
logger -t "cloud" "Could not find password server IP in $DHCP_FILE"
error_count=$((error_count+1))
break
fi
fi
done
if [ -z "$PASSWORD_SERVER_IP" ] ; then
logger -t "cloud" "Unable to determine the password server, falling back to data-server"
PASSWORD_SERVER_IP=data-server
fi
logger -t "cloud" "Sending request to password server at $PASSWORD_SERVER_IP"
password=$(wget -q -t 3 -T 20 -O - --header "DomU_Request: send_my_password" http://$PASSWORD_SERVER_IP:$PASSWORD_SERVER_PORT)
if [ $? -eq 0 ]; then
password=$(echo $password | tr -d '\r')
logger -t "cloud" "Got response from server at $PASSWORD_SERVER_IP"
case $password in
"")
logger -t "cloud" "Password server at $PASSWORD_SERVER_IP did not have any password for the VM"
;;
"bad_request")
logger -t "cloud" "VM sent an invalid request to password server at $PASSWORD_SERVER_IP"
error_count=$((error_count+1))
;;
"saved_password")
logger -t "cloud" "VM has already saved a password from the password server at $PASSWORD_SERVER_IP"
;;
*)
logger -t "cloud" "VM got a valid password from server at $PASSWORD_SERVER_IP"
password_received=1
;;
esac
else
logger -t "cloud" "Failed to send request to password server at $PASSWORD_SERVER_IP"
error_count=$((error_count+1))
fi
if [ "$password_received" == "0" ]; then
if [ "$error_count" == "$file_count" ]; then
logger -t "cloud" "Failed to get password from any server"

36
setup/bindir/cloud-set-guest-sshkey.in
View File

@ -37,32 +37,24 @@ for DHCP_FILE in $DHCP_FOLDERS; do
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"
publickey=$(wget -q -t 3 -T 20 -O - http://$SSHKEY_SERVER_IP/latest/public-keys)
if [ $? -eq 0 ]; then
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
keys_received=1
break
fi
logger -t "cloud" "Found ssh key server at $SSHKEY_SERVER_IP"
break
else
logger -t "cloud" "Could not find ssh key server IP in $DHCP_FILE trying with the name data-server "
logger -t "cloud" "Could not find ssh key server IP in $DHCP_FILE"
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 -q -t 3 -T 20 -O - http://data-server/latest/public-keys)
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
if [ -z "$SSHKEY_SERVER_IP" ]; then
logger -t "cloud" "Unable to determine the password server, falling back to data-server"
SSHKEY_SERVER_IP=data-server
fi
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
publickey=$(wget -q -t 3 -T 20 -O - http://$SSHKEY_SERVER_IP/latest/public-keys)
if [ $? -eq 0 ]; then
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
keys_received=1
fi
if [ "$keys_received" == "0" ]; then
@ -94,4 +86,4 @@ echo "$publickey" >> $authorized
which restorecon && restorecon -R -v $sshdir
exit 0
exit 0