Merge "Only stop n-cpu in stop_nova_compute"

This commit is contained in:
Jenkins 2014-03-14 13:10:05 +00:00 committed by Gerrit Code Review
commit 3e57ac64e7

View File

@ -716,6 +716,7 @@ function start_nova {
} }
function stop_nova_compute { function stop_nova_compute {
screen_stop n-cpu
if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then
stop_nova_hypervisor stop_nova_hypervisor
fi fi
@ -725,7 +726,7 @@ function stop_nova_rest {
# Kill the nova screen windows # Kill the nova screen windows
# Some services are listed here twice since more than one instance # Some services are listed here twice since more than one instance
# of a service may be running in certain configs. # 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-cell n-cell n-api-meta n-obj; do for serv in n-api 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
screen_stop $serv screen_stop $serv
done done
} }