From 736dee5b822d5a539f5e523f8d23266a2474f4fe Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 13 Apr 2017 11:37:26 +0800
Subject: [PATCH] Remove deprecated parameters

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

Change-Id: Ic226b36070ea51d9e9a6b46e5184ef4667fc9bd5
---
 manifests/init.pp                               | 17 -----------------
 ...eprecated_init-options-a91378136d978251.yaml |  4 ++++
 2 files changed, 4 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_init-options-a91378136d978251.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index fa9b39fcc..c3d628833 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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
diff --git a/releasenotes/notes/remove_deprecated_init-options-a91378136d978251.yaml b/releasenotes/notes/remove_deprecated_init-options-a91378136d978251.yaml
new file mode 100644
index 000000000..b3d700e2e
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_init-options-a91378136d978251.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - Removed deprecated option neutron::memcache_servers.
+  - Removed deprecated option neutron::mac_generation_retries.