summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorMatthew Treinish <mtreinish@kortar.org>2017-02-10 10:09:26 -0500
committerMatthew Treinish <mtreinish@kortar.org>2017-02-10 10:10:15 -0500
commit3ece1cd96d983e3fd321a1d4555221efc1be1e5b (patch)
treebdabf1c74d7f4bce0d62ab6e990f9a2693ee263d /devstack
parenta61a4fd647fd5a9c0ec868f96c4cb438173095be (diff)
Disable swap-volume in tempest when ceph is used
Ceph doesn't support volume swapping so disable that feature in tempest. Change-Id: I8f3da1d730113b100526662ba7ec71f603ab36da
Notes
Notes (review): Code-Review+1: Jordan Pittier <jordan.pittier@scality.com> Code-Review+2: Sean Dague <sean@dague.net> Code-Review+2: Jon Bernard <jobernar@redhat.com> Code-Review+1: Andrea Frittoli <andrea.frittoli@gmail.com> Workflow+1: Jon Bernard <jobernar@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 10 Feb 2017 16:42:50 +0000 Reviewed-on: https://review.openstack.org/432342 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 3b5b317..74ea3ed 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -82,8 +82,14 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
82 fi 82 fi
83 fi 83 fi
84 fi 84 fi
85elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
86 if is_service_enabled tempest; then
87 iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume False
88 fi
85fi 89fi
86 90
91
92
87if [[ "$1" == "unstack" ]]; then 93if [[ "$1" == "unstack" ]]; then
88 if [ "$CEPH_CONTAINERIZED" = "False" ]; then 94 if [ "$CEPH_CONTAINERIZED" = "False" ]; then
89 if [ "$REMOTE_CEPH" = "True" ]; then 95 if [ "$REMOTE_CEPH" = "True" ]; then