openstack/grenade
Code Issues Proposed changes

Check if c-vol is enabled

Browse Source 
start_cinder from devstack doesn't always run the c-vol service
as it may be disabled (for example in a multi-node setup). The
log checks, however, were assuming it as always enabled.

Change-Id: Iab6156cc25f78e8f80b220bc93c2b2e4974a585a
This commit is contained in:
Joshua Hesketh 2016-08-16 10:34:03 +10:00
parent b0ee39f9f8
commit 26df715e83
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/70_cinder/upgrade.sh
View File

@ -63,8 +63,12 @@ $CINDER_BIN_DIR/cinder-manage db sync || die $LINENO "DB migration error"
start_cinder
# Don't succeed unless the services come up
ensure_services_started cinder-api cinder-volume
ensure_logs_exist c-api c-vol
ensure_services_started cinder-api
ensure_logs_exist c-api
if is_service_enabled c-vol; then
ensure_services_started cinder-volume
ensure_logs_exist c-vol
fi
set +o xtrace
echo "*********************************************************************"