commit 00626a3186650fb111d9af5e2d69311aa5b3d3c2
author Jenkins <jenkins@review.openstack.org> Tue Dec 11 16:45:37 2012 +0000
committer Gerrit Code Review <review@openstack.org> Tue Dec 11 16:45:37 2012 +0000
tree 7011d34da49abd9c5166ada5579c79caa5270ea4
parent 9ec34214fce505892937b1cb91c5ece60cdd7882
parent 60e9c0ab22309d1b0b857761be16d4d58a1b251e

Merge "Quantum cleanups"

exercises/euca.sh

diff --git a/exercises/euca.sh b/exercises/euca.sh
index 67da1be..982653e 100755
--- a/exercises/euca.sh
+++ b/exercises/euca.sh
@@ -90,7 +90,7 @@
    die_if_not_set VOLUME "Failure to get volume"
 
    # Test volume has become available
-   if ! timeout $ASSOCIATE_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then
+   if ! timeout $RUNNING_TIMEOUT sh -c "while ! euca-describe-volumes $VOLUME | grep -q available; do sleep 1; done"; then
        echo "volume didnt become available within $RUNNING_TIMEOUT seconds"
        exit 1
    fi

lib/heat

diff --git a/lib/heat b/lib/heat
index b640fbc..feaadec 100644
--- a/lib/heat
+++ b/lib/heat
@@ -124,7 +124,7 @@
     iniset $HEAT_ENGINE_CONF DEFAULT bind_host $HEAT_ENGINE_HOST
     iniset $HEAT_ENGINE_CONF DEFAULT bind_port $HEAT_ENGINE_PORT
     iniset $HEAT_ENGINE_CONF DEFAULT heat_metadata_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT
-    iniset $HEAT_ENGINE_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_CFN_HOST:$HEAT_CFN_PORT/v1/waitcondition
+    iniset $HEAT_ENGINE_CONF DEFAULT heat_waitcondition_server_url http://$HEAT_API_CFN_HOST:$HEAT_API_CFN_PORT/v1/waitcondition
     iniset $HEAT_ENGINE_CONF DEFAULT heat_watch_server_url http://$HEAT_API_CW_HOST:$HEAT_API_CW_PORT
     local dburl
     database_connection_url dburl heat

stack.sh

diff --git a/stack.sh b/stack.sh
index d58f5f5..b8e59bc 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1355,6 +1355,7 @@
         iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT verbose False
         iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT debug False
         iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
+        iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT root_helper "$Q_RR_COMMAND"
         quantum_setup_keystone $QUANTUM_TEST_CONFIG_FILE DEFAULT set_auth_url
         if [[ "$Q_PLUGIN" == "openvswitch" ]]; then
             iniset $QUANTUM_TEST_CONFIG_FILE DEFAULT interface_driver quantum.agent.linux.interface.OVSInterfaceDriver
@@ -1441,8 +1442,6 @@
         fi
     elif is_service_enabled n-net; then
         add_nova_opt "network_manager=nova.network.manager.$NET_MAN"
-        add_nova_opt "instance_dns_manager=nova.network.minidns.MiniDNS"
-        add_nova_opt "floating_ip_dns_manager=nova.network.minidns.MiniDNS"
         add_nova_opt "public_interface=$PUBLIC_INTERFACE"
         add_nova_opt "vlan_interface=$VLAN_INTERFACE"
         add_nova_opt "flat_network_bridge=$FLAT_NETWORK_BRIDGE"