diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-19 04:19:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-19 04:19:39 +0000 |
| commit | 8d73a833b6499167ee89c34ffb5e24867f027e97 (patch) | |
| tree | dc10ba94680abc30591a41b0df1cee38e22620f8 /devstack/upgrade | |
| parent | 75c19eade34205dde174dec641ac8171ac4e6bf1 (diff) | |
| parent | 6128bce5d7795cfeb017e2aeda10acc7d7923280 (diff) | |
| download | ironic-8d73a833b6499167ee89c34ffb5e24867f027e97.tar.gz | |
Merge "Do not restart n-cpu during upgrade"
Diffstat (limited to 'devstack/upgrade')
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index e8105df15..b7cae14e3 100755 --- a/devstack/upgrade/upgrade.sh +++ b/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 |