commit 8928ce12b6c6ddf74b6942463fcaf16b9fd74844
author Jenkins <jenkins@review.openstack.org> Thu Jan 02 03:39:06 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jan 02 03:39:06 2014 +0000
tree 4d05ae3a6ab6c0709fcf8b18947f4ab5efd7a4ed
parent 15d2526db91ed34bff85280d482d5a6303db5756
parent e4b85590037974b04487be5b4e23166a8a35d9dc

Merge "Set default_network in tempest.conf"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 0969b2d..95b300c 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -283,6 +283,7 @@
     iniset $TEMPEST_CONF network tenant_networks_reachable "$tenant_networks_reachable"
     iniset $TEMPEST_CONF network public_network_id "$public_network_id"
     iniset $TEMPEST_CONF network public_router_id "$public_router_id"
+    iniset $TEMPEST_CONF network default_network "$FIXED_RANGE"
 
     # boto
     iniset $TEMPEST_CONF boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud"