From 9335b17c7284a52c5e7acdf2180784782558ae1b Mon Sep 17 00:00:00 2001
From: yatin <yatin.karel@nectechnologies.in>
Date: Wed, 23 Nov 2016 10:54:38 +0530
Subject: [PATCH] Remove KEYSTONE_CATALOG_BACKEND from magnum 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 magnum plugin as well. Refer below for
it's deprecation and removal:-
http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.html

Change-Id: I9ad6e0577918e811e9dd051b56aa69bfe2c391a0
Closes-Bug: #1644085
---
 devstack/lib/magnum | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index 35ce02b28b..96bf4a053c 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -108,16 +108,13 @@ function create_magnum_accounts {
 
     create_service_user "magnum" "admin"
 
-    if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-
-        local magnum_service=$(get_or_create_service "magnum" \
-            "container-infra" "Container Infrastructure Management Service")
-        get_or_create_endpoint $magnum_service \
-            "$REGION_NAME" \
-            "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST:$MAGNUM_SERVICE_PORT/v1" \
-            "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST:$MAGNUM_SERVICE_PORT/v1" \
-            "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST:$MAGNUM_SERVICE_PORT/v1"
-    fi
+    local magnum_service=$(get_or_create_service "magnum" \
+        "container-infra" "Container Infrastructure Management Service")
+    get_or_create_endpoint $magnum_service \
+        "$REGION_NAME" \
+        "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST:$MAGNUM_SERVICE_PORT/v1" \
+        "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST:$MAGNUM_SERVICE_PORT/v1" \
+        "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST:$MAGNUM_SERVICE_PORT/v1"
 
 }