Browse code

Merge "lib/tempest: stop using deprecated config option."

Jenkins authored on 2016/05/17 15:20:19
Showing 1 changed files
... ...
@@ -330,14 +330,14 @@ function configure_tempest {
330 330
         tempest_compute_max_microversion=None
331 331
     fi
332 332
     if [ "$tempest_compute_min_microversion" == "None" ]; then
333
-        inicomment $TEMPEST_CONFIG compute-feature-enabled min_microversion
333
+        inicomment $TEMPEST_CONFIG compute min_microversion
334 334
     else
335
-        iniset $TEMPEST_CONFIG compute-feature-enabled min_microversion $tempest_compute_min_microversion
335
+        iniset $TEMPEST_CONFIG compute min_microversion $tempest_compute_min_microversion
336 336
     fi
337 337
     if [ "$tempest_compute_max_microversion" == "None" ]; then
338
-        inicomment $TEMPEST_CONFIG compute-feature-enabled max_microversion
338
+        inicomment $TEMPEST_CONFIG compute max_microversion
339 339
     else
340
-        iniset $TEMPEST_CONFIG compute-feature-enabled max_microversion $tempest_compute_max_microversion
340
+        iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
341 341
     fi
342 342
 
343 343
     iniset $TEMPEST_CONFIG compute-feature-enabled resize True
... ...
@@ -373,7 +373,7 @@ function configure_tempest {
373 373
 
374 374
     # Network
375 375
     iniset $TEMPEST_CONFIG network api_version 2.0
376
-    iniset $TEMPEST_CONFIG network tenant_networks_reachable false
376
+    iniset $TEMPEST_CONFIG network project_networks_reachable false
377 377
     iniset $TEMPEST_CONFIG network public_network_id "$public_network_id"
378 378
     iniset $TEMPEST_CONFIG network public_router_id "$public_router_id"
379 379
     iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE"