diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 875e3eaea5..e0760e563d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -32,16 +32,12 @@ function create_sahara_accounts {
 
     create_service_user "sahara"
 
-    if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
-        get_or_create_service "sahara" \
-                                "data-processing" \
-                                "Sahara Data Processing"
-        get_or_create_endpoint "data-processing" \
-            "$REGION_NAME" \
-            "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \
-            "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \
-            "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s"
-    fi
+    get_or_create_service "sahara" "data-processing" "Sahara Data Processing"
+    get_or_create_endpoint "data-processing" \
+        "$REGION_NAME" \
+        "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \
+        "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \
+        "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s"
 }
 
 # cleanup_sahara() - Remove residual data files, anything left over from