summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-27 17:01:03 +0000
committerGerrit Code Review <review@openstack.org>2017-03-27 17:01:03 +0000
commitb54b88a8d1d59abd601f784ab09d2d44866d205b (patch)
tree44423caeb59cfcc98830ab3d51611d916847bbbb
parentdfad98b42536bea15dc6448cde54a2e8849619f8 (diff)
parentd05e56955c895ff7f6351e02318cc47bb1f8f78d (diff)
Merge "Grenade: don't enable tempest plugins in settings" into stable/newton4.2.2stable/newton
-rw-r--r--devstack/upgrade/settings3
1 files changed, 0 insertions, 3 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index a4cd6e2..b195f0a 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -1,6 +1,3 @@
1# Enable our tests; also enable ironic tempest plugin as we depend on it.
2export TEMPEST_PLUGINS="/opt/stack/new/ironic /opt/stack/new/ironic-inspector"
3
4# Enabling Inspector grenade plug-in 1# Enabling Inspector grenade plug-in
5# Based on Ironic/devstack/grenade/settings 2# Based on Ironic/devstack/grenade/settings
6register_project_for_upgrade ironic-inspector 3register_project_for_upgrade ironic-inspector