summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Rollenhagen <jim@jimrollenhagen.com>2016-11-15 09:37:02 -0500
committerVasyl Saienko <vsaienko@mirantis.com>2016-12-21 11:34:44 +0000
commit2f5787e5b8db9f843afeb8053e9ee85234c2e690 (patch)
treed0696e351b945f62a1caf94c8fc90e615347f697
parentfac0a5fa8755d3dd5b7c59780f80b52c43b24c90 (diff)
downloadironic-2f5787e5b8db9f843afeb8053e9ee85234c2e690.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) (cherry picked from commit 8d6561103013e91ee7238145f8b9c2e39523febc)
-rw-r--r--devstack/lib/ironic4
1 files changed, 4 insertions, 0 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 3be88cb80..11ea1ddd3 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1028,6 +1028,10 @@ function ironic_configure_tempest {
iniset $TEMPEST_CONFIG compute flavor_ref_alt $bm_flavor_id
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
}