commit c3cc66df52583d1d5fd3ca106fc37827b6ced1f4
author Jenkins <jenkins@review.openstack.org> Thu Aug 07 15:11:07 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 07 15:11:07 2014 +0000
tree fec3682164014ab0db5550ca3c298919312b8d92
parent 717807e0bbab616446ef9b394700140d77a66b4d
parent 85395e74945f814ae980aec25bf2ba99daa5f585

Merge "Do not isolate networks for baremetal"

tempest/common/isolated_creds.py

diff --git a/tempest/common/isolated_creds.py b/tempest/common/isolated_creds.py
index 98b0116..05d758f 100644
--- a/tempest/common/isolated_creds.py
+++ b/tempest/common/isolated_creds.py
@@ -330,7 +330,8 @@
             # Maintained until tests are ported
             LOG.info("Acquired isolated creds:\n credentials: %s"
                      % credentials)
-            if CONF.service_available.neutron:
+            if (CONF.service_available.neutron and
+                not CONF.baremetal.driver_enabled):
                 network, subnet, router = self._create_network_resources(
                     credentials.tenant_id)
                 self.isolated_net_resources[credential_type] = (