@@ -660,19 +660,26 @@ function start_nova() {

         screen_it n-obj "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-objectstore"

 }

-# stop_nova() - Stop running processes (non-screen)

-function stop_nova() {

+function stop_nova_compute {

+    if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then

+        stop_nova_hypervisor

+    fi

+}

+

+function stop_nova_rest {

     # Kill the nova screen windows

     # Some services are listed here twice since more than one instance

     # of a service may be running in certain configs.

     for serv in n-api n-cpu n-crt n-net n-sch n-novnc n-xvnc n-cauth n-spice n-cond n-cond n-cell n-cell n-api-meta; do

         screen_stop $serv

     done

-    if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then

-        stop_nova_hypervisor

-    fi

 }

+# stop_nova() - Stop running processes (non-screen)

+function stop_nova() {

+    stop_nova_rest

+    stop_nova_compute

+}

 # Restore xtrace

 $XTRACE