Browse code

Merge "Add variable to configure the run of IPv6 Tests"

Jenkins authored on 2014/02/27 13:46:22
Showing 1 changed files
... ...
@@ -63,6 +63,9 @@ TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}
63 63
 TEMPEST_VOLUME_VENDOR=${TEMPEST_VOLUME_VENDOR:-"Open Source"}
64 64
 TEMPEST_STORAGE_PROTOCOL=${TEMPEST_STORAGE_PROTOCOL:-iSCSI}
65 65
 
66
+# Neutron/Network variables
67
+IPV6_ENABLED=$(trueorfalse True $IPV6_ENABLED)
68
+
66 69
 # Functions
67 70
 # ---------
68 71
 
... ...
@@ -284,11 +287,13 @@ function configure_tempest() {
284 284
     # Compute admin
285 285
     iniset $TEMPEST_CONFIG "compute-admin" password "$password" # DEPRECATED
286 286
 
287
+    # Network
287 288
     iniset $TEMPEST_CONFIG network api_version 2.0
288 289
     iniset $TEMPEST_CONFIG network tenant_networks_reachable "$tenant_networks_reachable"
289 290
     iniset $TEMPEST_CONFIG network public_network_id "$public_network_id"
290 291
     iniset $TEMPEST_CONFIG network public_router_id "$public_router_id"
291 292
     iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE"
293
+    iniset $TEMPEST_CONFIG network ipv6_enabled "$IPV6_ENABLED"
292 294
 
293 295
     # boto
294 296
     iniset $TEMPEST_CONFIG boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud"