Merge "Use fixed network for ssh when n-net is enabled"

This commit is contained in:
Jenkins 2013-12-05 18:13:21 +00:00 committed by Gerrit Code Review
commit 3422668612

View File

@ -193,7 +193,9 @@ function configure_tempest() {
if [ "$Q_USE_NAMESPACE" != "False" ]; then if [ "$Q_USE_NAMESPACE" != "False" ]; then
tenant_networks_reachable=false tenant_networks_reachable=false
if ! is_service_enabled n-net; then
ssh_connect_method="floating" ssh_connect_method="floating"
fi
else else
tenant_networks_reachable=true tenant_networks_reachable=true
fi fi