Merge "Drop creating extra endpoints in devstack"
This commit is contained in:
commit
e80ce9e0f6
|
@ -414,13 +414,13 @@ function create_heat_accounts {
|
||||||
get_or_create_endpoint \
|
get_or_create_endpoint \
|
||||||
"orchestration" \
|
"orchestration" \
|
||||||
"$REGION_NAME" \
|
"$REGION_NAME" \
|
||||||
"$heat_api_service_url" "$heat_api_service_url" "$heat_api_service_url"
|
"$heat_api_service_url"
|
||||||
|
|
||||||
get_or_create_service "heat-cfn" "cloudformation" "Heat CloudFormation Service"
|
get_or_create_service "heat-cfn" "cloudformation" "Heat CloudFormation Service"
|
||||||
get_or_create_endpoint \
|
get_or_create_endpoint \
|
||||||
"cloudformation" \
|
"cloudformation" \
|
||||||
"$REGION_NAME" \
|
"$REGION_NAME" \
|
||||||
"$heat_cfn_api_service_url" "$heat_cfn_api_service_url" "$heat_cfn_api_service_url"
|
"$heat_cfn_api_service_url"
|
||||||
|
|
||||||
# heat_stack_user role is for users created by Heat
|
# heat_stack_user role is for users created by Heat
|
||||||
get_or_create_role "heat_stack_user"
|
get_or_create_role "heat_stack_user"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Devstack settings
|
# Devstack settings
|
||||||
|
|
||||||
# We have to add Heat to enabled services for screen_it to work
|
# We have to add Heat to enabled services for screen_it to work
|
||||||
# It consists of 4 parts
|
# It consists of three parts
|
||||||
|
|
||||||
enable_service h-eng
|
enable_service h-eng
|
||||||
enable_service h-api
|
enable_service h-api
|
||||||
|
|
Loading…
Reference in New Issue