fix creation of endpoints

Change-Id: I0a9bc1df10dc2c5727e186a0c565965663e3c0d5
This commit is contained in:
Vitaly Gridnev 2016-11-23 13:45:12 +03:00
parent 2d56cf13a5
commit 7864cc4058
1 changed files with 6 additions and 10 deletions

View File

@ -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