openstack/devstack
Code Issues Proposed changes

Merge "Split up stop_nova to match start_nova"

Browse Source
This commit is contained in:
Jenkins 2014-03-13 02:15:03 +00:00 committed by Gerrit Code Review
commit dd1b5bb465
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nova
View File

@ -715,17 +715,25 @@ function start_nova {
start_nova_rest
}
# 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-cell n-cell n-api-meta n-obj; 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
}