Remove deprecated parameters
Change-Id: I783e9e3ed1a798ab6cc2e56b4d648bd58d316bbe
This commit is contained in:
Tobias Urdin
parent
da39b582cc
commit
562d730918
@ -38,12 +38,6 @@
|
||||
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*database_min_pool_size*]
|
||||
# (Optional) Minimum number of SQL connections to keep open in a pool.
|
||||
# Defaults to undef
|
||||
#
|
||||
class watcher::db (
|
||||
$database_connection = 'sqlite:////var/lib/watcher/watcher.sqlite',
|
||||
$database_connection_recycle_time = $::os_service_default,
|
||||
@ -53,16 +47,10 @@ class watcher::db (
|
||||
$database_retry_interval = $::os_service_default,
|
||||
$database_max_overflow = $::os_service_default,
|
||||
$database_pool_timeout = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$database_min_pool_size = undef,
|
||||
) {
|
||||
|
||||
include watcher::deps
|
||||
|
||||
if $database_min_pool_size {
|
||||
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
|
||||
}
|
||||
|
||||
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
|
||||
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
|
||||
|
||||
|
||||
@ -236,77 +236,6 @@
|
||||
#
|
||||
# Daniel Pawlik <daniel.pawlik@corp.ovh.com>
|
||||
#
|
||||
# === DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*rpc_cast_timeout*]
|
||||
# (optional) Seconds to wait before a cast expires (TTL).
|
||||
# The default value of -1 specifies an infinite linger
|
||||
# period. The value of 0 specifies no linger period.
|
||||
# Pending messages shall be discarded immediately
|
||||
# when the socket is closed. Only supported by impl_zmq.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_poll_timeout*]
|
||||
# (optional) The default number of seconds that poll should wait.
|
||||
# Poll raises timeout exception when timeout expired.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_bind_address*]
|
||||
# (optional) ZeroMQ bind address.
|
||||
# Should be a wildcard (*), an ethernet interface, or IP.
|
||||
# The "host" option should point or resolve to this address.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_bind_port_retries*]
|
||||
# (optional) Number of retries to find free port number
|
||||
# before fail with ZMQBindError.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_concurrency*]
|
||||
# (optional) Type of concurrency used.
|
||||
# Either "native" or "eventlet".
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_contexts*]
|
||||
# (optional) Number of ZeroMQ contexts.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_host*]
|
||||
# (optional) Name of this node.
|
||||
# Must be a valid hostname, FQDN, or IP address.
|
||||
# Must match "host" option, if running Nova.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_ipc_dir*]
|
||||
# (optional) Directory for holding IPC sockets.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_matchmaker*]
|
||||
# (optional) MatchMaker driver.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_max_port*]
|
||||
# (optional) Maximal port number for random ports range.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_min_port*]
|
||||
# (optional) Minimal port number for random ports range.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*rpc_zmq_topic_backlog*]
|
||||
# (optional) Maximum number of ingress messages to locally buffer per topic.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*use_pub_sub*]
|
||||
# (optional) Use PUB/SUB pattern for fanout methods.
|
||||
# PUB/SUB always uses proxy.
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*zmq_target_expire*]
|
||||
# (optional) Expiration timeout in seconds of a name service
|
||||
# record about existing target ( < 0 means no timeout).
|
||||
# Defaults to undef.
|
||||
#
|
||||
class watcher (
|
||||
$purge_config = false,
|
||||
$use_ssl = false,
|
||||
@ -359,21 +288,6 @@ class watcher (
|
||||
$notification_transport_url = $::os_service_default,
|
||||
$notification_driver = $::os_service_default,
|
||||
$notification_topics = $::os_service_default,
|
||||
## DEPRECATED PARAMS
|
||||
$rpc_cast_timeout = undef,
|
||||
$rpc_poll_timeout = undef,
|
||||
$rpc_zmq_bind_address = undef,
|
||||
$rpc_zmq_bind_port_retries = undef,
|
||||
$rpc_zmq_concurrency = undef,
|
||||
$rpc_zmq_contexts = undef,
|
||||
$rpc_zmq_host = undef,
|
||||
$rpc_zmq_ipc_dir = undef,
|
||||
$rpc_zmq_matchmaker = undef,
|
||||
$rpc_zmq_max_port = undef,
|
||||
$rpc_zmq_min_port = undef,
|
||||
$rpc_zmq_topic_backlog = undef,
|
||||
$use_pub_sub = undef,
|
||||
$zmq_target_expire = undef,
|
||||
) {
|
||||
|
||||
include openstacklib::openstackclient
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The rpc_cast_timeout, rpc_poll_timeout, rpc_zmq_bind_address,
|
||||
rpc_zmq_bind_port_retries, rpc_zmq_concurrency, rpc_zmq_contexts,
|
||||
rpc_zmq_host, rpc_zmq_ipc_dir, rpc_zmq_matchmaker,
|
||||
rpc_zmq_max_port, rpc_zmq_min_port, rpc_zmq_topic_backlog, use_pub_sub
|
||||
and zmq_target_expire parameters in watcher init class is removed.
|
||||
- |
|
||||
The database_min_pool_size parameter in watcher::db class is removed.
|
||||
Loading…
x
Reference in New Issue
Block a user