From ad1f14ccc86cb52a9f92ad9796ae057d29e45a95 Mon Sep 17 00:00:00 2001
From: Graham Hayes <graham.hayes@hpe.com>
Date: Fri, 2 Dec 2016 14:40:42 +0000
Subject: [PATCH] Update Devstack plugin

Change-Id: I1a3fe5c24ce42e1ca67e910e55270f0de4adf984
---
 devstack/plugin.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2a73a4732..9f44fb063 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -132,7 +132,7 @@ function configure_designate {
     fi
 
     # Setup the Keystone Integration
-    if is_service_enabled key; then
+    if is_service_enabled keystone; then
         iniset $DESIGNATE_CONF service:api auth_strategy keystone
         configure_auth_token_middleware $DESIGNATE_CONF designate $DESIGNATE_AUTH_CACHE_DIR
     fi
@@ -207,14 +207,12 @@ function create_designate_accounts {
     if is_service_enabled designate-api; then
         create_service_user "designate"
 
-        if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-            get_or_create_service "designate" "dns" "Designate DNS Service"
-            get_or_create_endpoint "dns" \
-                "$REGION_NAME" \
-                "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
-                "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
-                "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/"
-        fi
+        get_or_create_service "designate" "dns" "Designate DNS Service"
+        get_or_create_endpoint "dns" \
+            "$REGION_NAME" \
+            "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
+            "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
+            "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/"
     fi
 }
 
@@ -371,7 +369,7 @@ if is_service_enabled designate; then
             configure_designatedashboard
         fi
 
-        if is_service_enabled key; then
+        if is_service_enabled keystone; then
             echo_summary "Creating Designate Keystone accounts"
             create_designate_accounts
         fi