Don't always override CINDER_* env variables

Code Issues Proposed changes

We just want to set new defaults, not force the
variables. This way we can mix ceph and other
backends with like:
CINDER_ENABLED_BACKENDS=lvm:lvm-driver,ceph:ceph-driver
Change-Id: I99cc047bce2f584c2b54196a9c84267d2c686231

This commit is contained in:

Patrick East

2016年07月29日 17:56:17 -07:00

parent fec528cdb0

commit a7c81797a0

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/override-defaults

View File

@@ -11,6 +11,6 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)

ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)

if [[ $ENABLE_CEPH_CINDER == "True" ]]; then

CINDER_DRIVER=ceph

CINDER_ENABLED_BACKENDS=ceph

CINDER_DRIVER=${CINDER_DRIVER:-ceph}

CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}

fi

Don't always override CINDER_* env variables

4 devstack/override-defaults Unescape Escape View File

4
devstack/override-defaults

View File