From 55a6dd32a2f61b62bdf927ae30b70e5e12e06ddd Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Thu, 26 Mar 2015 13:07:52 -0700
Subject: [PATCH] Remove trove

There is currently no grenade testing of Trove, and we are working
to move trove devstack support into a plugin.  Remove the few
references to trove in this repo.

Change-Id: I7671a657be48cf9ae0211a51e4bc08867a231c73
---
 functions-common                    | 2 --
 tools/generate_javelin_resources.py | 1 -
 upgrade-tempest                     | 1 -
 3 files changed, 4 deletions(-)

diff --git a/functions-common b/functions-common
index 40a0d2b9..2309fc8e 100644
--- a/functions-common
+++ b/functions-common
@@ -1817,7 +1817,6 @@ function enable_service {
 #   **glance** returns true if any service enabled start with **g-**
 #   **neutron** returns true if any service enabled start with **q-**
 #   **swift** returns true if any service enabled start with **s-**
-#   **trove** returns true if any service enabled start with **tr-**
 #   For backward compatibility if we have **swift** in ENABLED_SERVICES all the
 #   **s-** services will be enabled. This will be deprecated in the future.
 #
@@ -1854,7 +1853,6 @@ function is_service_enabled {
         [[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && enabled=0
         [[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && enabled=0
         [[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && enabled=0
-        [[ ${service} == "trove" && ${ENABLED_SERVICES} =~ "tr-" ]] && enabled=0
         [[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && enabled=0
         [[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && enabled=0
         [[ ${service} == key-* && ${ENABLED_SERVICES} =~ "key" ]] && enabled=0
diff --git a/tools/generate_javelin_resources.py b/tools/generate_javelin_resources.py
index 7ae35f57..e90145c8 100755
--- a/tools/generate_javelin_resources.py
+++ b/tools/generate_javelin_resources.py
@@ -31,7 +31,6 @@ DEVSTACK_SERVICE_MAP = {
     'keystone': 'key',
     'nova': 'n-',
     'neutron': 'q-',
-    'trove': 'tr-',
     'swift': 's-',
 }
 
diff --git a/upgrade-tempest b/upgrade-tempest
index da674de8..77c2381a 100755
--- a/upgrade-tempest
+++ b/upgrade-tempest
@@ -65,7 +65,6 @@ source $TARGET_DEVSTACK_DIR/lib/neutron
 source $TARGET_DEVSTACK_DIR/lib/nova
 source $TARGET_DEVSTACK_DIR/lib/sahara
 source $TARGET_DEVSTACK_DIR/lib/swift
-source $TARGET_DEVSTACK_DIR/lib/trove
 source $TARGET_DEVSTACK_DIR/lib/zaqar
 
 # The following devstack libraries may have dependencies on service-specific