commit a66d54b8f85f4360783c75811de7664a3d923224
author Jenkins <jenkins@review.openstack.org> Mon Apr 06 03:23:03 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Apr 06 03:23:03 2015 +0000
tree 4d8df21b4760524183fb0c811d3d462590b1a177
parent d3dce8c610be9a6020bc692758e63d430bc5cd62
parent 577d1f2bcc96406dadc0baa379e5ffe82088f9df

Merge "Fix fixed_network bug 1439634"

tempest/common/fixed_network.py

diff --git a/tempest/common/fixed_network.py b/tempest/common/fixed_network.py
index b06ddf2..b533898 100644
--- a/tempest/common/fixed_network.py
+++ b/tempest/common/fixed_network.py
@@ -15,6 +15,7 @@
 
 from tempest_lib import exceptions as lib_exc
 
+from tempest.common import isolated_creds
 from tempest import config
 from tempest import exceptions
 
@@ -38,7 +39,7 @@
     network = None
     # NOTE(andreaf) get_primary_network will always be available once
     # bp test-accounts-continued is implemented
-    if (CONF.auth.allow_tenant_isolation and
+    if (isinstance(creds_provider, isolated_creds.IsolatedCreds) and
         (CONF.service_available.neutron and
          not CONF.service_available.ironic)):
         network = creds_provider.get_primary_network()