commit f82f7daa1423a923213f2d1ac336d4e01d9470e0
author Jenkins <jenkins@review.openstack.org> Sat Mar 03 19:17:43 2012 +0000
committer Gerrit Code Review <review@openstack.org> Sat Mar 03 19:17:43 2012 +0000
tree 50841b40dd9a85d0902fba87df7cfa1301bc4eb0
parent 2f8fd29d5adb51eeab8009dac2f6b87cfe52929e
parent 92e85601f47163fe18c55f63d46cd362654440a2

Merge "Allow people to specifiy the XENAPI_CONNECTION_URL"

stack.sh

diff --git a/stack.sh b/stack.sh
index 996c347..6bbf302 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1280,7 +1280,8 @@
 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"