summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorPatrick East <patrick.east@purestorage.com>2016-07-29 17:56:17 -0700
committerPatrick East <patrick.east@purestorage.com>2016-07-29 23:02:21 -0700
commita7c81797a0336b159e8da47e354f4e098b1cf92c (patch)
treee0ca5072ced61420123580b4337ba46837efb40a /devstack
parentfec528cdb030434f4d3f75d73719b161a45c5c12 (diff)
Don't always override CINDER_* env variables
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
Notes
Notes (review): Code-Review+1: Scott DAngelo <scott.dangelo@hpe.com> Code-Review+2: S├ębastien Han <seb@redhat.com> Workflow+1: S├ębastien Han <seb@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 18 Aug 2016 16:11:52 +0000 Reviewed-on: https://review.openstack.org/349154 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/override-defaults4
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/override-defaults b/devstack/override-defaults
index 73d7f6b..b6a65ed 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -11,6 +11,6 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)
11ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW) 11ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
12 12
13if [[ $ENABLE_CEPH_CINDER == "True" ]]; then 13if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
14 CINDER_DRIVER=ceph 14 CINDER_DRIVER=${CINDER_DRIVER:-ceph}
15 CINDER_ENABLED_BACKENDS=ceph 15 CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
16fi 16fi