Merge "DevStack: Keystone V3 Service/Endpoint Creation"

This commit is contained in:
Jenkins 2015-07-20 19:46:47 +00:00 committed by Gerrit Code Review
commit 6e4b21ede2

View File

@ -216,9 +216,8 @@ function create_designate_accounts {
create_service_user "designate" create_service_user "designate"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
local designate_service=$(get_or_create_service "designate" \ get_or_create_service "designate" "dns" "Designate DNS Service"
"dns" "Designate DNS Service") get_or_create_endpoint "dns" \
get_or_create_endpoint $designate_service \
"$REGION_NAME" \ "$REGION_NAME" \
"$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \ "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \
"$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \ "$DESIGNATE_SERVICE_PROTOCOL://$DESIGNATE_SERVICE_HOST:$DESIGNATE_SERVICE_PORT/" \