diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-05 06:21:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-05 06:21:36 +0000 |
| commit | e80ce9e0f6a5e158311a895dd819688328a8f27b (patch) | |
| tree | f7d16dda21067a7778b18d9c4f03cae6dba134b4 /devstack | |
| parent | 55d7b1327a9f8201b3d5309898e04ae7e7a10af8 (diff) | |
| parent | 45fd0ec9bbd57598a534bffa1b3e1cee02506df8 (diff) | |
| download | heat-e80ce9e0f6a5e158311a895dd819688328a8f27b.tar.gz | |
Merge "Drop creating extra endpoints in devstack"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/heat | 4 | ||||
| -rw-r--r-- | devstack/settings | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devstack/lib/heat b/devstack/lib/heat index 4a31d4acc..ca4b166e0 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -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" diff --git a/devstack/settings b/devstack/settings index f185d2a65..089c00e4f 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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 |