openstack
/
ironic
Code Issues Proposed changes

Remove ensure_logs_exist check during upgrade 

We now run services under systemd, and this check is not necessary in
this case. Follow-up to commit ee538d1e7c1a92cb8412713e03cdfbcdacad7fab
to grenade.

Change-Id: I84ca621f0200838c04e267101848dc7ca16a5cfe
This commit is contained in:
Vladyslav Drok 2017-08-16 11:36:08 +03:00
parent aa1abbdcd6
commit 72395ad46f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/upgrade/upgrade.sh
View File

@ -77,8 +77,6 @@ iniset $IRONIC_CONF_FILE DEFAULT pin_release_version ${BASE_DEVSTACK_BRANCH#*/}
ensure_started='ironic-conductor nova-compute '
ensure_stopped=''
# Don't succeed unless the services come up
logs_exist="ir-cond"
# Multinode grenade is designed to upgrade services only on primary node. And there is no way to manipulate
# subnode during grenade phases. With this after upgrade we can have upgraded (new) services on primary
# node and not upgraded (old) services on subnode.
@ -113,7 +111,6 @@ if [[ -n "$ensure_stopped" ]]; then
fi
ensure_services_started $ensure_started
ensure_logs_exist $logs_exist
# We need these steps only in case of flat-network
# NOTE(vsaienko) starting from Ocata when Neutron is restarted there is no guarantee that