From f52220939b3c47b95639fe4a7aea90815a0e3978 Mon Sep 17 00:00:00 2001
From: himani <himani.relan@nectechnologies.in>
Date: Wed, 23 Nov 2016 11:54:05 +0530
Subject: [PATCH] Removed check for KEYSTONE_CATALOG_BACKEND from trove plugin

Devstack has removed KEYSTONE_CATALOG_BACKEND from it's
repo: https://review.openstack.org/#/c/391380

Due to above change gate tests are failing, we should
remove it from trove plugin as well. Refer below for
it's deprecation and removal:-
http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.html

Closes-Bug: #1644085
Change-Id: I1c2024f629375a03bcb40fb9ee98c853ed52d53b
---
 devstack/plugin.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a79a0711b3..b4fb4f4b2d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -54,16 +54,13 @@ function create_trove_accounts {
 
         create_service_user "trove"
 
-        if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-
-            local trove_service=$(get_or_create_service "trove" \
-                "database" "Trove Service")
-            get_or_create_endpoint $trove_service \
-                "$REGION_NAME" \
-                "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
-                "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
-                "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s"
-        fi
+        local trove_service=$(get_or_create_service "trove" \
+            "database" "Trove Service")
+        get_or_create_endpoint $trove_service \
+            "$REGION_NAME" \
+            "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
+            "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s" \
+            "http://$SERVICE_HOST:8779/v1.0/\$(tenant_id)s"
     fi
 }