Merge "Remove heat::engine::heat_watch_server_url"
This commit is contained in:
commit
d66d6a57f1
@ -134,12 +134,6 @@
|
|||||||
# by user-controlled servers to make calls back to Heat.
|
# by user-controlled servers to make calls back to Heat.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*heat_watch_server_url*]
|
|
||||||
# (optional) URL of the Heat cloudwatch server
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
class heat::engine (
|
class heat::engine (
|
||||||
$auth_encryption_key,
|
$auth_encryption_key,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
@ -166,16 +160,10 @@ class heat::engine (
|
|||||||
$plugin_dirs = $::os_service_default,
|
$plugin_dirs = $::os_service_default,
|
||||||
$client_retry_limit = $::os_service_default,
|
$client_retry_limit = $::os_service_default,
|
||||||
$server_keystone_endpoint_type = $::os_service_default,
|
$server_keystone_endpoint_type = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$heat_watch_server_url = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include heat::deps
|
include heat::deps
|
||||||
|
|
||||||
if $heat_watch_server_url {
|
|
||||||
warning('heat_watch_server_url has no effect and will be removed in a future release.')
|
|
||||||
}
|
|
||||||
|
|
||||||
# Validate Heat Engine AES key
|
# Validate Heat Engine AES key
|
||||||
# must be either 16, 24, or 32 bytes long
|
# must be either 16, 24, or 32 bytes long
|
||||||
# https://bugs.launchpad.net/heat/+bug/1415887
|
# https://bugs.launchpad.net/heat/+bug/1415887
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The heat::engine::heat_watch_server_url parameter has been removed.
|
Loading…
Reference in New Issue
Block a user