openstack/devstack
Code Issues Proposed changes

Merge "Add data-processing service for Sahara"

Browse Source
This commit is contained in:
Jenkins
2015-03-03 23:47:52 +00:00
committed by Gerrit Code Review
parent aff8fb9be8 37a06f017b
commit 17d2059835
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/sahara
View File

@@ -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 \
"data_processing" \
--name "sahara" \
--description "Sahara Data Processing" \
-f value -c id
)
local sahara_service_new=$(openstack service create \
"data-processing" \
--name "sahara" \
--description "Sahara Data Processing" \
-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" \