From fade5da51ba5002a234729d37ffc329aa695bbca Mon Sep 17 00:00:00 2001
From: "Erlon R. Cruz" <erlon.cruz@fit-tecnologia.org.br>
Date: Wed, 21 Sep 2016 08:57:17 -0300
Subject: [PATCH] Allow multiple devstack Cinder plugins

This commit allows this plugin to be run in parallel with other devstack plugins
like glusterfs, ceph, etc. This is needed to allow gate jobs that test
multibackend features.

Change-Id: I79c5ee753607953ffad7e78b96ffea506d84fc21
---
 devstack/override-defaults | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/devstack/override-defaults b/devstack/override-defaults
index ca8a7fb..a84b006 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -2,9 +2,15 @@ ENABLE_NFS_CINDER=$(trueorfalse True ENABLE_NFS_CINDER)
 
 if [[ $ENABLE_NFS_CINDER == "True" ]]; then
     CINDER_DRIVER=nfs
-    CINDER_ENABLED_BACKENDS=nfs:nfs
+    CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-nfs:nfs}
     # NOTE(mriedem): This is a workaround for Cinder bug 1642394.
     CINDER_IMG_CACHE_ENABLED=False
 
+    # Always make sure that once the plugin is enabled, the backend will be
+    # properly activated.
+    if [[ ! $CINDER_ENABLED_BACKENDS == *nfs:nfs* ]]; then
+        CINDER_ENABLED_BACKENDS+=',nfs:nfs'
+    fi
+
     TEMPEST_STORAGE_PROTOCOL=nfs
 fi