From f217f6f0c66113f714f8f02947a3c8de9dd6465c Mon Sep 17 00:00:00 2001
From: zhangshuai <446077695@qq.com>
Date: Thu, 24 Nov 2016 14:19:17 +0800
Subject: [PATCH] Fix devstack plugin

As the sake of devstack project changing, karbor service will not be added
to keystone sercies successfully, fullstack will be failed.

Change-Id: I0825ea29abbc807b9a7b7fb2a263afd87a70551c
---
 devstack/plugin.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index dbc73d1c..d3d01e96 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -26,14 +26,11 @@ function create_karbor_accounts {
 
         create_service_user "$KARBOR_SERVICE_NAME" "admin"
 
-        if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-
-            get_or_create_service "$KARBOR_SERVICE_NAME" "$KARBOR_SERVICE_TYPE" "Application Data Protection Service"
-            get_or_create_endpoint "$KARBOR_SERVICE_TYPE" "$REGION_NAME" \
-                "$KARBOR_API_PROTOCOL://$KARBOR_API_HOST:$KARBOR_API_PORT/v1/\$(tenant_id)s" \
-                "$KARBOR_API_PROTOCOL://$KARBOR_API_HOST:$KARBOR_API_PORT/v1/\$(tenant_id)s" \
-                "$KARBOR_API_PROTOCOL://$KARBOR_API_HOST:$KARBOR_API_PORT/v1/\$(tenant_id)s"
-        fi
+        get_or_create_service "$KARBOR_SERVICE_NAME" "$KARBOR_SERVICE_TYPE" "Application Data Protection Service"
+        get_or_create_endpoint "$KARBOR_SERVICE_TYPE" "$REGION_NAME" \
+            "$KARBOR_API_PROTOCOL://$KARBOR_API_HOST:$KARBOR_API_PORT/v1/\$(tenant_id)s" \
+            "$KARBOR_API_PROTOCOL://$KARBOR_API_HOST:$KARBOR_API_PORT/v1/\$(tenant_id)s" \
+            "$KARBOR_API_PROTOCOL://$KARBOR_API_HOST:$KARBOR_API_PORT/v1/\$(tenant_id)s"
     fi
 }