summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlon R. Cruz <erlon.cruz@fit-tecnologia.org.br>2016-09-21 08:57:17 -0300
committerErlon R. Cruz <erlon.cruz@fit-tecnologia.org.br>2016-11-28 15:25:26 -0200
commitfade5da51ba5002a234729d37ffc329aa695bbca (patch)
treeb1ce7746bf3013a0f43599f0587520d331001438
parentfc041321aed2b5aa8381de6ed845fcf6d8b276ab (diff)
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
Notes
Notes (review): Code-Review+2: Tom Barron <tpb@dyncloud.net> Code-Review+1: Sean McGinnis <sean.mcginnis@gmail.com> Code-Review+2: Eric Harney <eharney@redhat.com> Workflow+1: Eric Harney <eharney@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 20 Dec 2016 14:40:32 +0000 Reviewed-on: https://review.openstack.org/375103 Project: openstack/devstack-plugin-nfs Branch: refs/heads/master
-rw-r--r--devstack/override-defaults8
1 files changed, 7 insertions, 1 deletions
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)
2 2
3if [[ $ENABLE_NFS_CINDER == "True" ]]; then 3if [[ $ENABLE_NFS_CINDER == "True" ]]; then
4 CINDER_DRIVER=nfs 4 CINDER_DRIVER=nfs
5 CINDER_ENABLED_BACKENDS=nfs:nfs 5 CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-nfs:nfs}
6 # NOTE(mriedem): This is a workaround for Cinder bug 1642394. 6 # NOTE(mriedem): This is a workaround for Cinder bug 1642394.
7 CINDER_IMG_CACHE_ENABLED=False 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 TEMPEST_STORAGE_PROTOCOL=nfs 15 TEMPEST_STORAGE_PROTOCOL=nfs
10fi 16fi