Allow devstack plugin to work without Cinder

The current devstack plugin has a hidden dependency on
Cinder, even for drivers that don't require Cinder (such
as LVM). This patch tries to eliminate that dependency.

Also avoid editing cinder.conf when Cinder isn't present.

Closes-Bug: 1553351
Change-Id: Iea2a83fc54412c18401e589ea0706ae95214ab9d
This commit is contained in:
Ben Swartzlander 2016-02-10 13:45:53 -05:00
parent f81bc489b8
commit 1279dd9a6e
4 changed files with 4 additions and 1 deletions

View File

@ -0,0 +1 @@
lvm2

View File

@ -0,0 +1 @@
lvm2

View File

@ -0,0 +1 @@
lvm2

View File

@ -757,7 +757,7 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
fi
# Cinder config update
if [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then
if is_service_enabled cinder && [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then
CINDER_CONF=${CINDER_CONF:-/etc/cinder/cinder.conf}
CINDER_ENABLED_BACKENDS=$(iniget $CINDER_CONF DEFAULT enabled_backends)
for BN in ${CINDER_ENABLED_BACKENDS//,/ }; do