openstack
/
heat
Code Issues Proposed changes

Merge "Drop creating extra endpoints in devstack"

This commit is contained in:
Zuul 2019-12-05 06:21:36 +00:00 committed by Gerrit Code Review
parent 55d7b1327a 45fd0ec9bb
commit e80ce9e0f6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/heat
View File

@ -414,13 +414,13 @@ function create_heat_accounts {
get_or_create_endpoint \
"orchestration" \
"$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_endpoint \
"cloudformation" \
"$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
get_or_create_role "heat_stack_user"

2
devstack/settings
View File

@ -1,7 +1,7 @@
# Devstack settings
# 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-api