Merge "Fix hard coded quantum url and port"

This commit is contained in:
Jenkins 2013-02-24 07:04:13 +00:00 committed by Gerrit Code Review
commit 3bd75a8d01

View File

@ -348,7 +348,7 @@ function start_quantum_service_and_check() {
# Start the Quantum service # Start the Quantum service
screen_it q-svc "cd $QUANTUM_DIR && python $QUANTUM_DIR/bin/quantum-server --config-file $QUANTUM_CONF --config-file /$Q_PLUGIN_CONF_FILE" screen_it q-svc "cd $QUANTUM_DIR && python $QUANTUM_DIR/bin/quantum-server --config-file $QUANTUM_CONF --config-file /$Q_PLUGIN_CONF_FILE"
echo "Waiting for Quantum to start..." echo "Waiting for Quantum to start..."
if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= wget -q -O- http://127.0.0.1:9696; do sleep 1; done"; then if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= wget -q -O- http://$Q_HOST:$Q_PORT; do sleep 1; done"; then
echo "Quantum did not start" echo "Quantum did not start"
exit 1 exit 1
fi fi