openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-05-17 06:20:19 +00:00 committed by Gerrit Code Review
commit 59ed73a3d4
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

@ -330,14 +330,14 @@ function configure_tempest {
tempest_compute_max_microversion=None tempest_compute_max_microversion=None
fi fi
if [ "$tempest_compute_min_microversion" == "None" ]; then if [ "$tempest_compute_min_microversion" == "None" ]; then
inicomment $TEMPEST_CONFIG compute-feature-enabled min_microversion inicomment $TEMPEST_CONFIG compute min_microversion
else else
iniset $TEMPEST_CONFIG compute-feature-enabled min_microversion $tempest_compute_min_microversion iniset $TEMPEST_CONFIG compute min_microversion $tempest_compute_min_microversion
fi fi
if [ "$tempest_compute_max_microversion" == "None" ]; then if [ "$tempest_compute_max_microversion" == "None" ]; then
inicomment $TEMPEST_CONFIG compute-feature-enabled max_microversion inicomment $TEMPEST_CONFIG compute max_microversion
else else
iniset $TEMPEST_CONFIG compute-feature-enabled max_microversion $tempest_compute_max_microversion iniset $TEMPEST_CONFIG compute max_microversion $tempest_compute_max_microversion
fi fi
iniset $TEMPEST_CONFIG compute-feature-enabled resize True iniset $TEMPEST_CONFIG compute-feature-enabled resize True
@ -373,7 +373,7 @@ function configure_tempest {
# Network # Network
iniset $TEMPEST_CONFIG network api_version 2.0 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_network_id "$public_network_id"
iniset $TEMPEST_CONFIG network public_router_id "$public_router_id" iniset $TEMPEST_CONFIG network public_router_id "$public_router_id"
iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE" iniset $TEMPEST_CONFIG network default_network "$FIXED_RANGE"