openstack
/
devstack
Code Issues Proposed changes

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 f5a50a0fa6)
This commit is contained in:
Jordan Pittier 2016-05-10 14:56:12 +02:00 committed by Ghanshyam Mann
parent f48b81aea0
commit f77d2147e2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tempest
View File

@ -354,14 +354,14 @@ function configure_tempest {
tempest_compute_max_microversion=None
fi
if [ "$tempest_compute_min_microversion" == "None" ]; then
inicomment $TEMPEST_CONFIG compute-feature-enabled min_microversion
inicomment $TEMPEST_CONFIG compute min_microversion
else
iniset $TEMPEST_CONFIG compute-feature-enabled min_microversion $tempest_compute_min_microversion
iniset $TEMPEST_CONFIG compute min_microversion $tempest_compute_min_microversion
fi
if [ "$tempest_compute_max_microversion" == "None" ]; then
inicomment $TEMPEST_CONFIG compute-feature-enabled max_microversion
inicomment $TEMPEST_CONFIG compute max_microversion
else
iniset $TEMPEST_CONFIG compute-feature-enabled max_microversion $tempest_compute_max_microversion
iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
fi
# TODO(mriedem): Remove allow_port_security_disabled after liberty-eol.
@ -398,7 +398,7 @@ function configure_tempest {
# Network
iniset $TEMPEST_CONFIG network api_version 2.0
iniset $TEMPEST_CONFIG network tenant_networks_reachable false
iniset $TEMPEST_CONFIG network project_networks_reachable false
iniset $TEMPEST_CONFIG network public_network_id "$public_network_id"
iniset $TEMPEST_CONFIG network public_router_id "$public_router_id"
iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE"