commit ffb96b85d306d715762eb0effb1ee66d405833b2
author Jenkins <jenkins@review.openstack.org> Mon Jan 25 16:42:24 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 25 16:42:25 2016 +0000
tree 4169c0c561eeb6c6b3120bbe97a8c6a794995ad9
parent a7b21cd858f8188b340c0b38e2836e96a828e446
parent 5544c4a74fb985d10bc3f27fa7778a5824248979

Merge "always default to floating ips for validation"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 7fe63dd..3c34aad 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -127,7 +127,7 @@
     local flavor_lines
     local public_network_id
     local public_router_id
-    local ssh_connect_method="fixed"
+    local ssh_connect_method="floating"
 
     # Save IFS
     ifs=$IFS
@@ -236,10 +236,6 @@
         fi
     fi
 
-    if ! is_service_enabled n-net; then
-        ssh_connect_method="floating"
-    fi
-
     ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
 
     if [ "$Q_L3_ENABLED" = "True" ]; then