Split stop_nova into: stop_nova_compute and stop_nova_rest. This is
needed to support the partial-ncpu grenade test where we want to stop
everything but nova_compute.
Change-Id: I6a21821277e56897d705ca5746806e2211632d12
... | ... |
@@ -715,17 +715,25 @@ function start_nova { |
715 | 715 |
start_nova_rest |
716 | 716 |
} |
717 | 717 |
|
718 |
-# stop_nova() - Stop running processes (non-screen) |
|
719 |
-function stop_nova { |
|
718 |
+function stop_nova_compute { |
|
719 |
+ if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then |
|
720 |
+ stop_nova_hypervisor |
|
721 |
+ fi |
|
722 |
+} |
|
723 |
+ |
|
724 |
+function stop_nova_rest { |
|
720 | 725 |
# Kill the nova screen windows |
721 | 726 |
# Some services are listed here twice since more than one instance |
722 | 727 |
# of a service may be running in certain configs. |
723 | 728 |
for serv in n-api n-cpu n-crt n-net n-sch n-novnc n-xvnc n-cauth n-spice n-cond n-cell n-cell n-api-meta n-obj; do |
724 | 729 |
screen_stop $serv |
725 | 730 |
done |
726 |
- if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then |
|
727 |
- stop_nova_hypervisor |
|
728 |
- fi |
|
731 |
+} |
|
732 |
+ |
|
733 |
+# stop_nova() - Stop running processes (non-screen) |
|
734 |
+function stop_nova { |
|
735 |
+ stop_nova_rest |
|
736 |
+ stop_nova_compute |
|
729 | 737 |
} |
730 | 738 |
|
731 | 739 |
|