Browse Source

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
Erlon R. Cruz 2 years ago
parent
commit
fade5da51b
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      devstack/override-defaults

+ 7
- 1
devstack/override-defaults View File

@@ -2,9 +2,15 @@ ENABLE_NFS_CINDER=$(trueorfalse True ENABLE_NFS_CINDER)
2 2
 
3 3
 if [[ $ENABLE_NFS_CINDER == "True" ]]; then
4 4
     CINDER_DRIVER=nfs
5
-    CINDER_ENABLED_BACKENDS=nfs:nfs
5
+    CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-nfs:nfs}
6 6
     # NOTE(mriedem): This is a workaround for Cinder bug 1642394.
7 7
     CINDER_IMG_CACHE_ENABLED=False
8 8
 
9
+    # Always make sure that once the plugin is enabled, the backend will be
10
+    # properly activated.
11
+    if [[ ! $CINDER_ENABLED_BACKENDS == *nfs:nfs* ]]; then
12
+        CINDER_ENABLED_BACKENDS+=',nfs:nfs'
13
+    fi
14
+
9 15
     TEMPEST_STORAGE_PROTOCOL=nfs
10 16
 fi

Loading…
Cancel
Save