commit 4894ac0d29beed9e708e1e53aade1c2df3162c9d
author Jenkins <jenkins@review.openstack.org> Wed May 18 15:36:38 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 18 15:36:38 2016 +0000
tree d20f3bbfa5c19042a5824fb8630dcd446365dd96
parent ade7898e52cd89d271cbe264e0a9fc5e4d1df785
parent 53f59d802f9cc76bf898509344463d8ff3a32143

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

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index cce541c..d4d8cf2 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -238,7 +238,10 @@
 
     ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
 
-    if is_service_enabled q-l3; then
+    # the public network (for floating ip access) is only available
+    # if the extension is enabled.
+    EXTERNAL_NETWORK_EXT=$(neutron ext-list | grep 'external-net' | get_field 1)
+    if [[ -n $EXTERNAL_NETWORK_EXT ]]; then
         public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \
             awk '{print $2}')
     fi