From ff6bdd7454695f8a380698c8027f022e88b33e52 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Tue, 13 Jun 2017 12:07:51 -0400
Subject: [PATCH] Disable compute shelve tests

This is to workaround this test which is not currently
working:

https://review.openstack.org/#/c/471352/

Change-Id: I9506e326f9432eda3a057996805d4b0cd7a91446
---
 devstack/plugin.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 74ea3ed..3f56d83 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -85,6 +85,13 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
 elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
     if is_service_enabled tempest; then
         iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume False
+
+        # This is only being set because the tempest test
+        # test_shelve_unshelve_server fails with an
+        # "After unshelve, shelved image is not deleted"
+        # failure.  Re-enable this feature when that test is fixed.
+        # https://review.openstack.org/#/c/471352/
+        iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
     fi
 fi