Remove the deprecated manage_service parameter

These parameters were deprecated and renamed during the previous cycle
because of the confusing behavior which we can hardly guess from their
names[1].

[1] b7cfb61a6d

Change-Id: I93aba377d20da0733f17199707197d4e31a1606f

manifests/agent.pp

@@ -28,12 +28,6 @@
 #  (optional) Agent host:port pairs to listen on.
 #  Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*service_ensure*]
-#  (optional) Whether the designate agent service will be running.
-#  Defaults to 'DEPRECATED'
-#
 class designate::agent (
   $package_ensure     = present,
   $agent_package_name = $::designate::params::agent_package_name,
@@ -41,19 +35,10 @@ class designate::agent (
   $manage_service     = true,
   $backend_driver     = 'bind9',
   $listen             = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $service_ensure     = 'DEPRECATED',
 ) inherits designate {
 
   include designate::deps
 
-  if $service_ensure != 'DEPRECATED' {
-    warning('The service_ensure parameter is deprecated. Use the manage_service parameter.')
-    $manage_service_real = $service_ensure
-  } else {
-    $manage_service_real = $manage_service
-  }
-
   designate_config {
     'service:agent/backend_driver' : value => $backend_driver;
     'service:agent/listen' :         value => $listen;
@@ -61,7 +46,7 @@ class designate::agent (
 
   designate::generic_service { 'agent':
     enabled        => $enabled,
-    manage_service => $manage_service_real,
+    manage_service => $manage_service,
     package_ensure => $package_ensure,
     package_name   => $agent_package_name,
     service_name   => $::designate::params::agent_service_name,

manifests/api.pp

@@ -89,12 +89,6 @@
 #   HTTPProxyToWSGI middleware.
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*service_ensure*]
-#  (optional) Whether the designate api service will be running.
-#  Defaults to 'DEPRECATED'
-#
 class designate::api (
   $package_ensure               = present,
   $api_package_name             = $::designate::params::api_package_name,
@@ -117,19 +111,10 @@ class designate::api (
   $enabled_extensions_v2        = $::os_service_default,
   $enabled_extensions_admin     = $::os_service_default,
   $enable_proxy_headers_parsing = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $service_ensure               = 'DEPRECATED',
 ) inherits designate {
 
   include designate::deps
 
-  if $service_ensure != 'DEPRECATED' {
-    warning('The service_ensure parameter is deprecated. Use the manage_service parameter.')
-    $manage_service_real = $service_ensure
-  } else {
-    $manage_service_real = $manage_service
-  }
-
   # API Service
   designate_config {
     'service:api/listen'                    : value => $listen;
@@ -160,7 +145,7 @@ class designate::api (
 
   designate::generic_service { 'api':
     enabled        => $enabled,
-    manage_service => $manage_service_real,
+    manage_service => $manage_service,
     package_ensure => $package_ensure,
     package_name   => $api_package_name,
     service_name   => $::designate::params::api_service_name,

manifests/central.pp

@@ -59,10 +59,6 @@
 #  (optional) Maximum domain name length.
 #  Defaults to undef
 #
-# [*service_ensure*]
-#  (optional) Whether the designate central service will be running.
-#  Defaults to 'DEPRECATED'
-#
 class designate::central (
   $package_ensure             = present,
   $central_package_name       = $::designate::params::central_package_name,
@@ -78,20 +74,11 @@ class designate::central (
   $default_pool_id            = $::os_service_default,
   # DEPRECATED PARAMETERS
   $max_domain_name_len        = undef,
-  $service_ensure             = 'DEPRECATED',
-
 ) inherits designate {
 
   include designate::deps
   include designate::db
 
-  if $service_ensure != 'DEPRECATED' {
-    warning('The service_ensure parameter is deprecated. Use the manage_service parameter.')
-    $manage_service_real = $service_ensure
-  } else {
-    $manage_service_real = $manage_service
-  }
-
   designate_config {
     'service:central/managed_resource_email'     : value => $managed_resource_email;
     'service:central/managed_resource_tenant_id' : value => $managed_resource_tenant_id;
@@ -111,7 +98,7 @@ class designate::central (
 
   designate::generic_service { 'central':
     enabled        => $enabled,
-    manage_service => $manage_service_real,
+    manage_service => $manage_service,
     package_ensure => $package_ensure,
     package_name   => $central_package_name,
     service_name   => $::designate::params::central_service_name,

manifests/producer.pp

@@ -38,10 +38,6 @@
 #  (optional) URL to use for coordination, should be a tooz URL.
 #  Defaults to undef
 #
-# [*service_ensure*]
-#  (optional) Whether the designate producer service will be running.
-#  Defaults to 'DEPRECATED'
-#
 class designate::producer (
   $package_ensure = 'present',
   $package_name   = $::designate::params::producer_package_name,
@@ -52,16 +48,7 @@ class designate::producer (
   $enabled_tasks  = $::os_service_default,
   # DEPRECATED PARAMETERS
   $backend_url    = undef,
-  $service_ensure = 'DEPRECATED',
+) inherits designate {
-
-  ) inherits designate {
-
-  if $service_ensure != 'DEPRECATED' {
-    warning('The service_ensure parameter is deprecated. Use the manage_service parameter.')
-    $manage_service_real = $service_ensure
-  } else {
-    $manage_service_real = $manage_service
-  }
 
   designate_config {
     'service:producer/workers'       : value => $workers;
@@ -78,7 +65,7 @@ class designate::producer (
     package_ensure => $package_ensure,
     enabled        => $enabled,
     package_name   => $package_name,
-    manage_service => $manage_service_real,
+    manage_service => $manage_service,
     service_name   => $::designate::params::producer_service_name,
   }
 }

manifests/sink.pp

@@ -26,34 +26,19 @@
 #  else in the config.
 #  Defaults to undef
 #
-# DEPRECATED PARAMETERS
-#
-# [*service_ensure*]
-#  (optional) Whether the designate sink service will be running.
-#  Defaults to 'DEPRECATED'
-#
 class designate::sink (
   $package_ensure                = present,
   $sink_package_name             = $::designate::params::sink_package_name,
   $enabled                       = true,
   $manage_service                = true,
   $enabled_notification_handlers = undef,
-  # DEPRECATED PARAMETERS
-  $service_ensure               = 'DEPRECATED',
 ) inherits designate {
 
   include designate::deps
 
-  if $service_ensure != 'DEPRECATED' {
-    warning('The service_ensure parameter is deprecated. Use the manage_service parameter.')
-    $manage_service_real = $service_ensure
-  } else {
-    $manage_service_real = $manage_service
-  }
-
   designate::generic_service { 'sink':
     enabled        => $enabled,
-    manage_service => $manage_service_real,
+    manage_service => $manage_service,
     package_ensure => $package_ensure,
     package_name   => $sink_package_name,
     service_name   => $::designate::params::sink_service_name,

manifests/zone_manager.pp

@@ -36,12 +36,6 @@
 #  (optional) Whether to allow synchronous zone exports
 #  Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*service_ensure*]
-#  (optional) Whether the designate zone manager service will be running.
-#  Defaults to 'DEPRECATED'
-#
 class designate::zone_manager (
   $package_ensure            = 'present',
   $package_name              = $::designate::params::zone_manager_package_name,
@@ -51,16 +45,7 @@ class designate::zone_manager (
   $threads                   = $::os_service_default,
   $enabled_tasks             = $::os_service_default,
   $export_synchronous        = $::os_service_default,
-  # DEPRECATED PARAMETERS
+) inherits designate {
-  $service_ensure             = 'DEPRECATED',
-  ) inherits designate {
-
-  if $service_ensure != 'DEPRECATED' {
-    warning('The service_ensure parameter is deprecated. Use the manage_service parameter.')
-    $manage_service_real = $service_ensure
-  } else {
-    $manage_service_real = $manage_service
-  }
 
   designate_config {
     'service:zone_manager/workers'            : value => $workers;
@@ -73,7 +58,7 @@ class designate::zone_manager (
     package_ensure => $package_ensure,
     enabled        => $enabled,
     package_name   => $package_name,
-    manage_service => $manage_service_real,
+    manage_service => $manage_service,
     service_name   => $::designate::params::zone_manager_service_name,
   }
 }

releasenotes/notes/remove-service_ensure-603d0efc97e0afcb.yaml

@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    The following parameters have been removed.
+
+    - ``designate::producer::service_ensure``
+    - ``designate::central::service_ensure``
+    - ``designate::agent::service_ensure``
+    - ``designate::zone_manager::service_ensure``
+    - ``designate::sink::service_ensure``
+