From 0e29b9207d146a7a61ed46352046d6bc376894aa Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias@busybox.se>
Date: Sat, 19 May 2018 00:44:41 +0200
Subject: [PATCH] Remove deprecated parameters

Removes deprecated parameters that has been
deprecated for one cycle or more.

Depends-On: https://review.openstack.org/#/c/569542/
Change-Id: I3f53036f65cd520403efdb2e179a5509a0637b90
---
 examples/site.pp                              |  2 --
 manifests/api.pp                              | 30 -------------------
 manifests/statsd.pp                           | 21 -------------
 ...ed-host-port-workers-8bbe2e5ddf6b7072.yaml |  8 +++++
 4 files changed, 8 insertions(+), 53 deletions(-)
 create mode 100644 releasenotes/notes/gnocchi-api-remove-deprecated-host-port-workers-8bbe2e5ddf6b7072.yaml

diff --git a/examples/site.pp b/examples/site.pp
index f0807b05..249e3398 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -20,8 +20,6 @@ class { '::gnocchi::api':
 
 class { '::gnocchi::statsd':
   resource_id         => '07f26121-5777-48ba-8a0b-d70468133dd9',
-  user_id             => 'f81e9b1f-9505-4298-bc33-43dfbd9a973b',
-  project_id          => '203ef419-e73f-4b8a-a73f-3d599a72b18d',
   archive_policy_name => 'high',
   flush_delay         => '100',
 }
diff --git a/manifests/api.pp b/manifests/api.pp
index d168b7bc..9cd13e46 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -46,20 +46,6 @@
 #   (optional) Middlewares to use.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*host*]
-#   (optional) The gnocchi api bind address.
-#   Defaults to $::os_service_default
-#
-# [*port*]
-#   (optional) The gnocchi api port.
-#   Defaults to $::os_service_default
-#
-# [*workers*]
-#   (optional) Number of workers for Gnocchi API server.
-#   Defaults to $::os_service_default
-#
 class gnocchi::api (
   $manage_service               = true,
   $enabled                      = true,
@@ -70,27 +56,11 @@ class gnocchi::api (
   $auth_strategy                = 'keystone',
   $enable_proxy_headers_parsing = $::os_service_default,
   $middlewares                  = $::os_service_default,
-  # DEPRECATED
-  $host                         = $::os_service_default,
-  $port                         = $::os_service_default,
-  $workers                      = $::os_service_default,
 ) inherits gnocchi::params {
 
   include ::gnocchi::deps
   include ::gnocchi::policy
 
-  if !is_service_default($host) {
-    warning('host is deprecated')
-  }
-
-  if !is_service_default($port) {
-    warning('port is deprecated')
-  }
-
-  if !is_service_default($workers) {
-    warning('workers is deprecated')
-  }
-
   package { 'gnocchi-api':
     ensure => $package_ensure,
     name   => $::gnocchi::params::api_package_name,
diff --git a/manifests/statsd.pp b/manifests/statsd.pp
index c93c52d7..06785b2c 100644
--- a/manifests/statsd.pp
+++ b/manifests/statsd.pp
@@ -24,16 +24,6 @@
 #   (optional) Archive policy name to use when creating metrics.
 #   Defaults to undef.
 #
-# DEPRECATED PARAMETERS
-#
-# [*user_id*]
-#   (required) User UUID to use to identify statsd in Gnocchi.
-#   Defaults to undef.
-#
-# [*project_id*]
-#   (required) Project UUID to use to identify statsd in Gnocchi.
-#   Defaults to undef.
-#
 class gnocchi::statsd (
   $resource_id,
   $flush_delay,
@@ -41,21 +31,10 @@ class gnocchi::statsd (
   $manage_service      = true,
   $enabled             = true,
   $package_ensure      = 'present',
-  # DEPRECATED PARAMETERS
-  $user_id             = undef,
-  $project_id          = undef,
 ) inherits gnocchi::params {
 
   include ::gnocchi::deps
 
-  if $user_id {
-    warning('user_id parameter is deprecated and will be removed in the future release.')
-  }
-
-  if $project_id {
-    warning('project_id parameter is deprecated and will be removed in the future release.')
-  }
-
   package { 'gnocchi-statsd':
     ensure => $package_ensure,
     name   => $::gnocchi::params::statsd_package_name,
diff --git a/releasenotes/notes/gnocchi-api-remove-deprecated-host-port-workers-8bbe2e5ddf6b7072.yaml b/releasenotes/notes/gnocchi-api-remove-deprecated-host-port-workers-8bbe2e5ddf6b7072.yaml
new file mode 100644
index 00000000..8244723b
--- /dev/null
+++ b/releasenotes/notes/gnocchi-api-remove-deprecated-host-port-workers-8bbe2e5ddf6b7072.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The deprecated parameters glance::api::host, glance::api::port
+    and glance::api::workers has been removed.
+  - |
+    The deprecated parameters glance::statsd::user_id and
+    gnocchi::statsd::project_id has been removed.