Deprecate parameters deprecated in Ocata

Multiple parameters deprecated in Ocata, and to be removed in Pike or a
future release.

Change-Id: Ie95e8d07273d168da0fe9ae1635774b230683efa

manifests/agents/l3.pp

@@ -38,11 +38,6 @@
 #   (optional) The port of the metadata server
 #   Defaults to $::os_service_default
 #
-# [*send_arp_for_ha*]
-#   (optional) Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
-#   to disable this feature.
-#   Defaults to $::os_service_default
-#
 # [*periodic_interval*]
 #   (optional) seconds between re-sync routers' data if needed
 #   Defaults to $::os_service_default
@@ -92,6 +87,13 @@
 #   (optional) L3 agent extensions to enable.
 #   Defaults to $::os_service_default
 #
+# == Deprecated
+#
+# [*send_arp_for_ha*]
+#   (deprecated) Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
+#   to disable this feature.
+#   Defaults to $::os_service_default
+#
 class neutron::agents::l3 (
   $package_ensure                   = 'present',
   $enabled                          = true,
@@ -101,7 +103,6 @@ class neutron::agents::l3 (
   $gateway_external_network_id      = $::os_service_default,
   $handle_internal_only_routers     = $::os_service_default,
   $metadata_port                    = $::os_service_default,
-  $send_arp_for_ha                  = $::os_service_default,
   $periodic_interval                = $::os_service_default,
   $periodic_fuzzy_delay             = $::os_service_default,
   $enable_metadata_proxy            = $::os_service_default,
@@ -113,6 +114,8 @@ class neutron::agents::l3 (
   $purge_config                     = false,
   $availability_zone                = $::os_service_default,
   $extensions                       = $::os_service_default,
+  # Deprecated
+  $send_arp_for_ha                  = $::os_service_default,
 ) {
 
   include ::neutron::deps
@@ -130,6 +133,11 @@ class neutron::agents::l3 (
     }
   }
 
+  if !is_service_default($send_arp_for_ha) {
+    deprecation('send_arp_for_ha', 'The l3-agent configuration option \
+send_arp_for_ha is deprecated in ocata release, and will be removed in Pike')
+  }
+
   neutron_l3_agent_config {
     'DEFAULT/debug':                            value => $debug;
     'DEFAULT/interface_driver':                 value => $interface_driver;

manifests/server.pp

@@ -171,10 +171,6 @@
 #   (optional) Deprecated, does nothing.
 #   Defaults to 'undef'.
 #
-# [*qos_notification_drivers*]
-#   (optional) Drivers list to use to send the update notification
-#   Defaults to $::os_service_default.
-#
 # [*network_auto_schedule*]
 #   (optional) Allow auto scheduling networks to DHCP agent
 #   Defaults to $::os_service_default.
@@ -219,6 +215,12 @@
 #   HTTPProxyToWSGI middleware.
 #   Defaults to $::os_service_default.
 #
+# == Deprecated
+#
+# [*qos_notification_drivers*]
+#   (deprecated) Drivers list to use to send the update notification
+#   Defaults to $::os_service_default.
+#
 
 class neutron::server (
   $package_ensure                   = 'present',
@@ -248,7 +250,6 @@ class neutron::server (
   $l3_ha                            = false,
   $max_l3_agents_per_router         = 3,
   $l3_ha_net_cidr                   = $::os_service_default,
-  $qos_notification_drivers         = $::os_service_default,
   $network_auto_schedule            = $::os_service_default,
   $ensure_vpnaas_package            = false,
   $ensure_fwaas_package             = false,
@@ -262,6 +263,7 @@ class neutron::server (
   $report_interval                  = undef,
   $state_path                       = undef,
   $lock_path                        = undef,
+  $qos_notification_drivers         = $::os_service_default,
 ) inherits ::neutron::params {
 
   include ::neutron::deps
@@ -364,6 +366,12 @@ class neutron::server (
     }
   }
 
+  if !is_service_default($qos_notification_drivers) {
+    deprecation('qos_notification_drivers', 'The qos configuration option \
+notification_drivers is deprecated in ocata release, and will be removed in a \
+future release')
+  }
+
   neutron_config { 'qos/notification_drivers': value => join(any2array($qos_notification_drivers), ',') }
 
   if ($::neutron::params::server_package) {

releasenotes/notes/deprecate_ocata_deprecations-cb42c8f439bdb1d1.yaml

@@ -0,0 +1,8 @@
+---
+deprecations:
+  - |
+    neutron::agents::l3::send_arp_for_ha is deprecated in Ocata, and will be
+    removed in Pike
+  - |
+    neutron::server::qos_notification_drivers is deprecated in Ocata, and
+    will be removed in a future release