Remove deprecated parameters

Removed deprecated option neutron::memcache_servers.
Removed deprecated option neutron::mac_generation_retries.

Change-Id: Ic226b36070ea51d9e9a6b46e5184ef4667fc9bd5
This commit is contained in:
ZhongShengping 2017-04-13 11:37:26 +08:00
parent 166f65f5ad
commit 736dee5b82
2 changed files with 4 additions and 17 deletions

View File

@ -335,13 +335,6 @@
#
# DEPRECATED PARAMETERS
#
# [*memcache_servers*]
# (optional) This option is deprecated an has no effect.
#
# [*mac_generation_retries*]
# (optional) How many times to try to generate a unique mac
# Defaults to $::os_service_default
#
# [*rabbit_password*]
# [*rabbit_host*]
# [*rabbit_port*]
@ -431,8 +424,6 @@ class neutron (
$notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default,
# DEPRECATED PARAMETERS
$memcache_servers = undef,
$mac_generation_retries = $::os_service_default,
$rabbit_password = $::os_service_default,
$rabbit_host = $::os_service_default,
$rabbit_hosts = $::os_service_default,
@ -471,14 +462,6 @@ class neutron (
warning('kombu_missing_consumer_retry_timeout should not be longer than rpc_response_timeout')
}
if $memcache_servers {
warning('memcache_servers option is deprecated, has no effect and will be removed after Ocata.')
}
if ! is_service_default($mac_generation_retries) {
warning('mac_generation_retries option is deprecated, has no effect and will be removed after Ocata.')
}
if !is_service_default($rabbit_host) or
!is_service_default($rabbit_hosts) or
!is_service_default($rabbit_password) or

View File

@ -0,0 +1,4 @@
---
other:
- Removed deprecated option neutron::memcache_servers.
- Removed deprecated option neutron::mac_generation_retries.