openstack/devstack
Code Issues Proposed changes

Merge "always default to floating ips for validation"

Browse Source
This commit is contained in:
Jenkins 2016-01-25 16:42:24 +00:00 committed by Gerrit Code Review
commit ffb96b85d3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tempest
View File

@ -127,7 +127,7 @@ function configure_tempest {
local flavor_lines local flavor_lines
local public_network_id local public_network_id
local public_router_id local public_router_id
local ssh_connect_method="fixed" local ssh_connect_method="floating"
# Save IFS # Save IFS
ifs=$IFS ifs=$IFS
@ -236,10 +236,6 @@ function configure_tempest {
fi fi
fi fi
if ! is_service_enabled n-net; then
ssh_connect_method="floating"
fi
ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method} ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
if [ "$Q_L3_ENABLED" = "True" ]; then if [ "$Q_L3_ENABLED" = "True" ]; then