summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Rollenhagen <jim@jimrollenhagen.com>2016-11-15 09:37:02 -0500
committerJim Rollenhagen <jim@jimrollenhagen.com>2016-12-16 07:28:58 -0500
commit8d6561103013e91ee7238145f8b9c2e39523febc (patch)
tree4d0ada9eb5c03842eb9801597e9635a65b974f42
parente8d93a420b76423443d0480ed391f10b158e11ad (diff)
downloadironic-8d6561103013e91ee7238145f8b9c2e39523febc.tar.gz
Turn off tempest's multitenant network tests
This disables the multitenant networking tests that come from tempest's tree, but not the ones in ironic's tempest plugin. Change-Id: I62cc4ae3e9fe7dc63ec4373535fe6ae07084a381 (cherry picked from commit 0da98dee34f2b79fe092661ffc311717db739304)
-rw-r--r--devstack/lib/ironic4
1 files changed, 4 insertions, 0 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 60cde30aa..8f0f326cb 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1514,6 +1514,10 @@ function ironic_configure_tempest {
iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid
iniset $TEMPEST_CONFIG auth create_isolated_networks False
+ # NOTE(jroll) this disables multitenant network tests from tempest's
+ # tree, but not from our tree. This is a bit inconsistent, we should
+ # fix it.
+ iniset $TEMPEST_CONFIG network shared_physical_network True
iniset $TEMPEST_CONFIG network-feature-enabled port_admin_state_change False
}