summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem@us.ibm.com>2016-11-09 20:26:26 -0500
committerDiana Clarke <diana.joan.clarke@gmail.com>2016-11-17 00:15:36 +0000
commitfc041321aed2b5aa8381de6ed845fcf6d8b276ab (patch)
tree860d6eff792cd0b4ed36fdbe5554474b8937b188
parentebf915c8bf17f13e4ec13e5e5c841fbb67191ed3 (diff)
Don't run volume snapshot/clone tests in Tempest
The Cinder NFS backend doesn't yet support snapshot, clone or backup operations, so they should be disabled when running Tempest. We also have to explicitly disable the image cache in cinder because that relies on volume cloning which the NFS volume backend doesn't support. Depends-On: I5ad578a78d6cfd4186a8230ad472d4a7b92445c9 Change-Id: I8fb421276005f9ba9cbc6c55ba8b6089349fdb69
Notes
Notes (review): Code-Review+1: Sean McGinnis <sean.mcginnis@gmail.com> Code-Review+2: Eric Harney <eharney@redhat.com> Workflow+1: Eric Harney <eharney@redhat.com> Code-Review+2: Jay Bryant <jsbryant@us.ibm.com> Workflow+1: Jay Bryant <jsbryant@us.ibm.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 22 Nov 2016 16:27:16 +0000 Reviewed-on: https://review.openstack.org/395887 Project: openstack/devstack-plugin-nfs Branch: refs/heads/master
-rw-r--r--devstack/override-defaults2
-rw-r--r--devstack/plugin.sh12
2 files changed, 14 insertions, 0 deletions
diff --git a/devstack/override-defaults b/devstack/override-defaults
index 30098f0..ca8a7fb 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -3,6 +3,8 @@ ENABLE_NFS_CINDER=$(trueorfalse True ENABLE_NFS_CINDER)
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=nfs:nfs
6 # NOTE(mriedem): This is a workaround for Cinder bug 1642394.
7 CINDER_IMG_CACHE_ENABLED=False
6 8
7 TEMPEST_STORAGE_PROTOCOL=nfs 9 TEMPEST_STORAGE_PROTOCOL=nfs
8fi 10fi
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 47ad911..bfa47ce 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -78,6 +78,14 @@ function configure_cinder_nfs {
78 78
79} 79}
80 80
81# Configures tempest for running Cinder volume API tests with an NFS backend.
82function configure_tempest_nfs {
83 # The Cinder NFS backend doesn't yet support snapshot, backup or clone.
84 iniset $TEMPEST_CONFIG volume-feature-enabled snapshot False
85 iniset $TEMPEST_CONFIG volume-feature-enabled backup False
86 iniset $TEMPEST_CONFIG volume-feature-enabled clone False
87}
88
81 89
82if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then 90if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
83 echo_summary "Installing NFS" 91 echo_summary "Installing NFS"
@@ -91,6 +99,10 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
91 configure_cinder_nfs 99 configure_cinder_nfs
92 sudo service $NFS_SERVICE restart 100 sudo service $NFS_SERVICE restart
93 fi 101 fi
102elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
103 if is_nfs_enabled_for_service cinder; then
104 configure_tempest_nfs
105 fi
94fi 106fi
95 107
96if [[ "$1" == "unstack" ]]; then 108if [[ "$1" == "unstack" ]]; then