diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate
index 6e9de07c0..10e06e66f 100644
--- a/contrib/devstack/lib/designate
+++ b/contrib/devstack/lib/designate
@@ -216,9 +216,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/" \