From a7c81797a0336b159e8da47e354f4e098b1cf92c Mon Sep 17 00:00:00 2001
From: Patrick East <patrick.east@purestorage.com>
Date: Fri, 29 Jul 2016 17:56:17 -0700
Subject: [PATCH] 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
---
 devstack/override-defaults | 4 ++--
 1 file 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)
 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