diff --git a/devstack/lib/tacker b/devstack/lib/tacker
index f836e03d2..5a443ab5f 100644
--- a/devstack/lib/tacker
+++ b/devstack/lib/tacker
@@ -118,15 +118,13 @@ function create_tacker_accounts {
         get_or_create_role "advsvc"
         create_service_user "tacker" "advsvc"
 
-        if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-            local tacker_service=$(get_or_create_service "tacker" \
-                "nfv-orchestration" "Tacker NFV Orchestration Service")
-            get_or_create_endpoint $tacker_service \
-                "$REGION_NAME" \
-                "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \
-                "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \
-                "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/"
-        fi
+        local tacker_service=$(get_or_create_service "tacker" \
+            "nfv-orchestration" "Tacker NFV Orchestration Service")
+        get_or_create_endpoint $tacker_service \
+            "$REGION_NAME" \
+            "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \
+            "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/" \
+            "$TACKER_PROTOCOL://$SERVICE_HOST:$TACKER_PORT/"
     fi
 }