Merge "Ensure testing configuration can run as late as possible"

This commit is contained in:
Jenkins 2016-11-30 16:30:38 +00:00 committed by Gerrit Code Review
commit b719b55b1d

View File

@ -11,13 +11,16 @@ if is_service_enabled tempest; then
# Tempest config must come after layer 2 services are running # Tempest config must come after layer 2 services are running
: :
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
# Tempest config must come after all other plugins are run
:
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
# local.conf Tempest option overrides
:
elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
echo_summary "Initializing Tempest" echo_summary "Initializing Tempest"
configure_tempest configure_tempest
echo_summary "Installing Tempest Plugins" echo_summary "Installing Tempest Plugins"
install_tempest_plugins install_tempest_plugins
elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
# local.conf Tempest option overrides
:
fi fi
if [[ "$1" == "unstack" ]]; then if [[ "$1" == "unstack" ]]; then