Merge "Allow people to specifiy the XENAPI_CONNECTION_URL"

This commit is contained in:
Jenkins 2012-03-03 19:17:43 +00:00 committed by Gerrit Code Review
commit f82f7daa14

View File

@ -1280,7 +1280,8 @@ done
if [ "$VIRT_DRIVER" = 'xenserver' ]; then
read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
add_nova_flag "--connection_type=xenapi"
add_nova_flag "--xenapi_connection_url=http://169.254.0.1"
XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
add_nova_flag "--xenapi_connection_url=$XENAPI_CONNECTION_URL"
add_nova_flag "--xenapi_connection_username=root"
add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD"
add_nova_flag "--noflat_injected"