commit 73ed4880a61ee694c3c828964a73eb6ffcf6e4b5
author Jenkins <jenkins@review.openstack.org> Thu Jun 12 18:52:39 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jun 12 18:52:40 2014 +0000
tree 80bb351c599341299210d643a433982a750aeb3d
parent 27c29e895998136655f24c8328b85648d1214803
parent cd7cfef429003224b184626fe3b1ece26d68a3f0

Merge "Ironic: Add deploy kernel and deploy ramdisk to driver_info"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 64b5453..af32a9d 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -64,6 +64,7 @@
 
 # Neutron/Network variables
 IPV6_ENABLED=$(trueorfalse True $IPV6_ENABLED)
+IPV6_SUBNET_ATTRIBUTES_ENABLED=$(trueorfalse True $IPV6_SUBNET_ATTRIBUTES_ENABLED)
 
 # Functions
 # ---------
@@ -241,9 +242,6 @@
     iniset $TEMPEST_CONFIG compute build_timeout $BUILD_TIMEOUT
     iniset $TEMPEST_CONFIG volume build_timeout $BUILD_TIMEOUT
     iniset $TEMPEST_CONFIG boto build_timeout $BUILD_TIMEOUT
-    iniset $TEMPEST_CONFIG compute build_interval $BUILD_INTERVAL
-    iniset $TEMPEST_CONFIG volume build_interval $BUILD_INTERVAL
-    iniset $TEMPEST_CONFIG boto build_interval $BUILD_INTERVAL
     iniset $TEMPEST_CONFIG boto http_socket_timeout 5
 
     # Identity