Browse code

always default to floating ips for validation

fixed ips are not cross host accessible in our current config. So
always configure tempest to use floating ips.

Change-Id: I1cf605229070024c9d5d29c7a08967aa505fda7b

Sean Dague authored on 2016/01/25 22:27:06
Showing 1 changed files
... ...
@@ -127,7 +127,7 @@ function configure_tempest {
127 127
     local flavor_lines
128 128
     local public_network_id
129 129
     local public_router_id
130
-    local ssh_connect_method="fixed"
130
+    local ssh_connect_method="floating"
131 131
 
132 132
     # Save IFS
133 133
     ifs=$IFS
... ...
@@ -236,10 +236,6 @@ function configure_tempest {
236 236
         fi
237 237
     fi
238 238
 
239
-    if ! is_service_enabled n-net; then
240
-        ssh_connect_method="floating"
241
-    fi
242
-
243 239
     ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
244 240
 
245 241
     if [ "$Q_L3_ENABLED" = "True" ]; then