@@ -11,13 +11,16 @@ if is_service_enabled tempest; then

         # Tempest config must come after layer 2 services are running

         :

     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"

         configure_tempest

         echo_summary "Installing Tempest Plugins"

         install_tempest_plugins

-    elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then

-        # local.conf Tempest option overrides

-        :

     fi

     if [[ "$1" == "unstack" ]]; then