From 1ef6b0b7f6c38d155f1ccf7daf7a8027f13860e6 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@sileht.net>
Date: Wed, 22 Mar 2017 14:46:36 +0100
Subject: [PATCH] deprecate ceilometer::dispatcher::gnocchi::url

The url option of ceilometer::dispatcher::gnocchi doesn't exists anymore
since a while in Ceilometer.

So this change deprecate it for removal.

Change-Id: I2b87de910b73d65111d609b8722183c1852f9c35
---
 manifests/dispatcher/gnocchi.pp               | 19 +++++++++++++------
 ...occhi-dispatcher-url-63964185ca71e228.yaml |  4 ++++
 .../ceilometer_dispatcher_gnocchi_spec.rb     |  3 ---
 3 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/gnocchi-dispatcher-url-63964185ca71e228.yaml

diff --git a/manifests/dispatcher/gnocchi.pp b/manifests/dispatcher/gnocchi.pp
index 546ff1d..5ef0917 100644
--- a/manifests/dispatcher/gnocchi.pp
+++ b/manifests/dispatcher/gnocchi.pp
@@ -13,10 +13,6 @@
 #   generated by Gnocchi service activity
 #   Defaults to $::os_service_default.
 #
-# [*url*]
-#   (Optional) Gnocchi URL
-#   Defaults to $::os_service_default.
-#
 # [*archive_policy*]
 #   (Optional) The archive policy to use when the dispatcher
 #   Defaults to $::os_service_default.
@@ -26,20 +22,31 @@
 #   and gnocchi resources/metrics.
 #   Defaults to $::os_service_default.
 #
+# DEPRECATED PARAMETERS
+#
+# [*url*]
+#   (Optional) Gnocchi URL
+#   Defaults to undef
+#
+
 class ceilometer::dispatcher::gnocchi (
   $filter_service_activity   = $::os_service_default,
   $filter_project            = $::os_service_default,
-  $url                       = $::os_service_default,
   $archive_policy            = $::os_service_default,
   $resources_definition_file = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $url                       = undef,
 ) {
 
   include ::ceilometer::deps
 
+  if $url {
+    warning('url parameter is deprecated, has no effect and will be removed in the Q release.')
+  }
+
   ceilometer_config {
     'dispatcher_gnocchi/filter_service_activity':   value => $filter_service_activity;
     'dispatcher_gnocchi/filter_project':            value => $filter_project;
-    'dispatcher_gnocchi/url':                       value => $url;
     'dispatcher_gnocchi/archive_policy':            value => $archive_policy;
     'dispatcher_gnocchi/resources_definition_file': value => $resources_definition_file;
   }
diff --git a/releasenotes/notes/gnocchi-dispatcher-url-63964185ca71e228.yaml b/releasenotes/notes/gnocchi-dispatcher-url-63964185ca71e228.yaml
new file mode 100644
index 0000000..407593c
--- /dev/null
+++ b/releasenotes/notes/gnocchi-dispatcher-url-63964185ca71e228.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - url option of ceilometer::dispatcher::gnocchi is now deprecated for
+    removal, the parameter has no effect.
diff --git a/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb b/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
index a5b6444..c72c8db 100644
--- a/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
+++ b/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
@@ -14,7 +14,6 @@ describe 'ceilometer::dispatcher::gnocchi' do
     it 'configures gnocchi dispatcher' do
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_service_activity').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_ceilometer_config('dispatcher_gnocchi/url').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/archive_policy').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/resources_definition_file').with_value('<SERVICE DEFAULT>')
     end
@@ -23,13 +22,11 @@ describe 'ceilometer::dispatcher::gnocchi' do
       before do
         params.merge!(:filter_service_activity   => false,
                       :filter_project            => 'gnocchi_swift',
-                      :url                       => 'http://foo',
                       :archive_policy            => 'high',
                       :resources_definition_file => 'foo')
       end
       it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_service_activity').with_value('false') }
       it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('gnocchi_swift') }
-      it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/url').with_value('http://foo') }
       it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/archive_policy').with_value('high') }
       it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/resources_definition_file').with_value('foo') }
     end
-- 
2.45.2