@@ -65,9 +65,25 @@ function create_sahara_accounts {

     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then

-        local sahara_service=$(get_or_create_service "sahara" \

-            "data_processing" "Sahara Data Processing")

-        get_or_create_endpoint $sahara_service \

+        # TODO: remove "data_processing" service when #1356053 will be fixed

+        local sahara_service_old=$(openstack service create \

+            "sahara" \

+            --type "data_processing" \

+            --description "Sahara Data Processing (for Juno release)" \

+            -f value -c id

+        )

+        local sahara_service_new=$(openstack service create \

+            "sahara" \

+            --type "data-processing" \

+            --description "Sahara Data Processing (for Kilo and future releases)" \

+            -f value -c id

+        )

+        get_or_create_endpoint $sahara_service_old \

+            "$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"

+        get_or_create_endpoint $sahara_service_new \

             "$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" \