openstack/devstack
Code Issues Proposed changes

Merge "Don't set tempest fixed_network_name with neutron"

Browse Source
This commit is contained in:
Jenkins 2015-05-18 02:34:04 +00:00 committed by Gerrit Code Review
commit c9e842871b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tempest
View File

@ -344,7 +344,7 @@ function configure_tempest {
iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref
iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt
iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
if ! is_service_enabled n-cell; then if [[ ! $(is_service_enabled n-cell) && ! $(is_service_enabled neutron) ]]; then
iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
fi fi