openstack/deb-sahara
Code Issues Proposed changes

Merge "Remove old sahara endpoint"

Browse Source
This commit is contained in:
Jenkins 2015-10-18 13:00:28 +00:00 committed by Gerrit Code Review
commit a4a3495418
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devstack/plugin.sh
View File

@ -34,25 +34,13 @@ function create_sahara_accounts {
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
# TODO: remove "data_processing" service when #1356053 will be fixed local sahara_service=$(openstack service create \
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" \ "data-processing" \
--name "sahara" \ --name "sahara" \
--description "Sahara Data Processing" \ --description "Sahara Data Processing" \
-f value -c id -f value -c id
) )
get_or_create_endpoint $sahara_service_old \ get_or_create_endpoint $sahara_service \
"$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" \ "$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" \ "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \