From 86f5eefb5e3b538264a3df3eb08e0c4a0bc85dd9 Mon Sep 17 00:00:00 2001
From: Victor Ryzhenkin <vryzhenkin@mirantis.com>
Date: Fri, 12 Feb 2016 18:22:48 +0300
Subject: [PATCH] Remove KEYSTONE_CATALOG_BACKEND variable usage

- According upstream movement, we need to update our devstack
installation to avoid deployment failures.
- Patch in devstack: I4e5c7e86aefe72fc21c77d423033e9b169318fec

Change-Id: I6f30c6c5e768c4377fbc4da28688daca0404f927
Closes-Bug: #1545036
---
 devstack/plugin.sh | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 66052b12a..492f0ac9f 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -31,22 +31,20 @@ function create_murano_accounts() {
 
     create_service_user "murano"
 
-    if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        get_or_create_service "murano" "application-catalog" "Application Catalog Service"
-        get_or_create_endpoint "application-catalog" \
-            "$REGION_NAME" \
-            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
-            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT"
+    get_or_create_service "murano" "application-catalog" "Application Catalog Service"
+    get_or_create_endpoint "application-catalog" \
+        "$REGION_NAME" \
+        "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
+        "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT" \
+        "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_SERVICE_PORT"
 
-        if is_service_enabled murano-cfapi; then
-        get_or_create_service "murano-cfapi" "service-broker" "Murano CloudFoundry Service Broker"
-        get_or_create_endpoint "service-broker" \
-            "$REGION_NAME" \
-            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
-            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
-            "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT"
-        fi
+    if is_service_enabled murano-cfapi; then
+    get_or_create_service "murano-cfapi" "service-broker" "Murano CloudFoundry Service Broker"
+    get_or_create_endpoint "service-broker" \
+        "$REGION_NAME" \
+        "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
+        "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT" \
+        "$MURANO_SERVICE_PROTOCOL://$MURANO_SERVICE_HOST:$MURANO_CFAPI_SERVICE_PORT"
     fi
 }