commit 85395e74945f814ae980aec25bf2ba99daa5f585
author Adam Gandelman <adamg@ubuntu.com> Tue Jul 29 18:34:33 2014 -0700
committer Adam Gandelman <adamg@ubuntu.com> Wed Aug 06 16:40:37 2014 -0700
tree fe1a4b7b80e7e57ce231b94a7a34be3410cae18a
parent 14d309adb8ffe5e48a1b9b682e5f8681f9ca24d1

Do not isolate networks for baremetal

Network isolaton is not currently a supported feature for baremetal
deployments.  This adjusts the isolated credentials to avoid creation of
isolated network environments for created tenants.  Instead, we rely on
a shared private network serving addresses from a common subnet.

Change-Id: I34b16ed5a6f9221707f3a9d0d4619bb3b261e14f

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] = (