openstack/ironic
Code Issues Proposed changes

Merge "Do not restart n-cpu during upgrade"

Browse Source
This commit is contained in:
Jenkins 2017-08-19 04:19:39 +00:00 committed by Gerrit Code Review
commit 8d73a833b6
1 changed files with 8 additions and 5 deletions

13
devstack/upgrade/upgrade.sh

@ -100,11 +100,14 @@ fi
start_ironic
# NOTE(vsaienko) installing ironic service triggers apache restart, that
# may cause nova-compute failure due to LP1537076
stop_nova_compute || true
wait_for_keystone
start_nova_compute
# NOTE(vsaienko) do not restart n-cpu on multinode as we didn't upgrade nova.
if [[ "${HOST_TOPOLOGY}" != "multinode" ]]; then
# NOTE(vsaienko) installing ironic service triggers apache restart, that
# may cause nova-compute failure due to LP1537076
stop_nova_compute || true
wait_for_keystone
start_nova_compute
fi
if [[ -n "$ensure_stopped" ]]; then
ensure_services_stopped $ensure_stopped