Browse code

Merge "Allow people to specifiy the XENAPI_CONNECTION_URL"

Jenkins authored on 2012/03/04 04:17:43
Showing 1 changed files
... ...
@@ -1280,7 +1280,8 @@ done
1280 1280
 if [ "$VIRT_DRIVER" = 'xenserver' ]; then
1281 1281
     read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
1282 1282
     add_nova_flag "--connection_type=xenapi"
1283
-    add_nova_flag "--xenapi_connection_url=http://169.254.0.1"
1283
+    XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
1284
+    add_nova_flag "--xenapi_connection_url=$XENAPI_CONNECTION_URL"
1284 1285
     add_nova_flag "--xenapi_connection_username=root"
1285 1286
     add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD"
1286 1287
     add_nova_flag "--noflat_injected"