From 1338a53e357f2a2f0dc70485ec35a92241ec36ca Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@macinnes.ie>
Date: Wed, 1 Jul 2015 11:11:57 +0100
Subject: [PATCH] DevStack: Keystone V3 Service/Endpoint Creation

DevStack is moving to Keystone V3 for various KS
related tasks, and the API for several methods is
changing.

Change-Id: I1f49001ac0ca0e0cfa2d4b689d3d3b98661d35de
Depends-On: Ib3a375918a45fd6e37d873a1a5c0c4b26bdbb5d8
---
 contrib/devstack/lib/designate | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate
index 70709cc68..aa9a27203 100644
--- a/contrib/devstack/lib/designate
+++ b/contrib/devstack/lib/designate
@@ -214,9 +214,8 @@ function create_designate_accounts {
         create_service_user "designate"
 
         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-            local designate_service=$(get_or_create_service "designate" \
-                "dns" "Designate DNS Service")
-            get_or_create_endpoint $designate_service \
+            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/" \