Browse code

lib/tempest: stop using deprecated config option.

Use the new name instead.

This is needed to remove the deprecated config options from Tempest as Tempest is branch less and should be able to work with devstack mitaka.

Change-Id: I31f83ec70b8803a29a7be765661517d890ffd6f1
(cherry picked from commit f5a50a0fa6235c0e18984244a501292806704a16)

Jordan Pittier authored on 2016/05/10 21:56:12
Showing 1 changed files
... ...
@@ -354,14 +354,14 @@ function configure_tempest {
354 354
         tempest_compute_max_microversion=None
355 355
     fi
356 356
     if [ "$tempest_compute_min_microversion" == "None" ]; then
357
-        inicomment $TEMPEST_CONFIG compute-feature-enabled min_microversion
357
+        inicomment $TEMPEST_CONFIG compute min_microversion
358 358
     else
359
-        iniset $TEMPEST_CONFIG compute-feature-enabled min_microversion $tempest_compute_min_microversion
359
+        iniset $TEMPEST_CONFIG compute min_microversion $tempest_compute_min_microversion
360 360
     fi
361 361
     if [ "$tempest_compute_max_microversion" == "None" ]; then
362
-        inicomment $TEMPEST_CONFIG compute-feature-enabled max_microversion
362
+        inicomment $TEMPEST_CONFIG compute max_microversion
363 363
     else
364
-        iniset $TEMPEST_CONFIG compute-feature-enabled max_microversion $tempest_compute_max_microversion
364
+        iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
365 365
     fi
366 366
 
367 367
     # TODO(mriedem): Remove allow_port_security_disabled after liberty-eol.
... ...
@@ -398,7 +398,7 @@ function configure_tempest {
398 398
 
399 399
     # Network
400 400
     iniset $TEMPEST_CONFIG network api_version 2.0
401
-    iniset $TEMPEST_CONFIG network tenant_networks_reachable false
401
+    iniset $TEMPEST_CONFIG network project_networks_reachable false
402 402
     iniset $TEMPEST_CONFIG network public_network_id "$public_network_id"
403 403
     iniset $TEMPEST_CONFIG network public_router_id "$public_router_id"
404 404
     iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE"