Don't default metadata server URLs to localhost

These settings are all legacy, as for some time heat has instead supported
deriving the URLs internally using the endpoints from the keystone catalog.

Defaulting these to localhost seems like a bad default, as in
most cases heat will caclulate a more reasonable default (e.g something
derived from the actual heat public endpoint in keystone), and it's somewhat
surprising when you don't pass a value and get localhost instead of the heat
defaults.

They can still be used to override the keystone endpoint, which is sometimes
useful, but in most cases these should no longer be set IMO.

Note the relevant heat commits which make these settings optional are
Id402664e38e3da071ad634233b3a1f8e13af152d and
If8a2d3f37d87c26228e709c20f61969b397f2da0 (present in all Heat releases
since Mitaka)

Closes-Bug: #1641873
Change-Id: I90ccdd881a41d803e28064f44b821ab48a6fa8ea
(cherry picked from commit 6e8ef40483)
This commit is contained in:
Steven Hardy 2016-11-15 22:23:37 +00:00
parent f107762c35
commit 981babbd05
1 changed files with 6 additions and 6 deletions

View File

@ -29,15 +29,15 @@
#
# [*heat_metadata_server_url*]
# (optional) URL of the Heat metadata server
# Defaults to 'http://127.0.0.1:8000'
# Defaults to $::os_service_default.
#
# [*heat_waitcondition_server_url*]
# (optional) URL of the Heat waitcondition server
# Defaults to 'http://127.0.0.1:8000/v1/waitcondition'
# Defaults to $::os_service_default.
#
# [*heat_watch_server_url*]
# (optional) URL of the Heat cloudwatch server
# Defaults to 'http://127.0.0.1:8003'
# Defaults to $::os_service_default.
#
# [*engine_life_check_timeout*]
# (optional) RPC timeout (in seconds) for the engine liveness check that is
@ -111,9 +111,9 @@ class heat::engine (
$manage_service = true,
$enabled = true,
$heat_stack_user_role = $::os_service_default,
$heat_metadata_server_url = 'http://127.0.0.1:8000',
$heat_waitcondition_server_url = 'http://127.0.0.1:8000/v1/waitcondition',
$heat_watch_server_url = 'http://127.0.0.1:8003',
$heat_metadata_server_url = $::os_service_default,
$heat_waitcondition_server_url = $::os_service_default,
$heat_watch_server_url = $::os_service_default,
$engine_life_check_timeout = $::os_service_default,
$deferred_auth_method = $::os_service_default,
$default_software_config_transport = $::os_service_default,