Browse code

Merge "Use Neutron extension information to configure Tempest's public network"

Jenkins authored on 2016/05/19 00:36:38
Showing 1 changed files
... ...
@@ -238,7 +238,10 @@ function configure_tempest {
238 238
 
239 239
     ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
240 240
 
241
-    if is_service_enabled q-l3; then
241
+    # the public network (for floating ip access) is only available
242
+    # if the extension is enabled.
243
+    EXTERNAL_NETWORK_EXT=$(neutron ext-list | grep 'external-net' | get_field 1)
244
+    if [[ -n $EXTERNAL_NETWORK_EXT ]]; then
242 245
         public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \
243 246
             awk '{print $2}')
244 247
     fi