From a57f34f321ec31c66efe32ba96d89dd93e3a3f70 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@sileht.net>
Date: Mon, 25 Jun 2018 13:47:03 +0200
Subject: [PATCH] ceilometer: deprecation cleanup

Gnocchi dispatcher options will be removed upstream very soon [1].

But the deprecated options are still used in puppet-ceilometer and tht.

I proposed the puppet-gnocchi deprecation here [2]

ceilometer::dispatcher::gnocchi::url have been removed two cycles ago in
Ceilometer and is already ignored
.
ceilometer::dispatcher::gnocchi::archive_policy/filter_project are
passed to the url directly now.

ceilometer::dispatcher::gnocchi::resources_definition_file was set to
the default. So remove it does not change anything.

[1] https://review.openstack.org/#/c/575368/
[2] https://review.openstack.org/#/c/577794/

Change-Id: Ie0ff6f40d81b2e748347bd4c0e532531960bdefb
---
 puppet/services/ceilometer-base.yaml          | 20 ++++++++++++-------
 ...e-policy-deprecation-09c086e9a0f9af86.yaml |  5 +++++
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/gnocchi-archive-policy-deprecation-09c086e9a0f9af86.yaml

diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index f9bb912e20..6ef7ec235f 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -43,7 +43,7 @@ parameters:
     description: Whether to manage event_pipeline.yaml.
     type: boolean
   EventPipelinePublishers:
-    default: ['gnocchi://', 'panko://']
+    default: ['gnocchi://?filter_project=service&archive_policy=low', 'panko://']
     description: >
         A list of publishers to put in event_pipeline.yaml. When the
         collector is used, override this with notifier:// publisher.
@@ -56,7 +56,7 @@ parameters:
     description: Whether to manage pipeline.yaml.
     type: boolean
   PipelinePublishers:
-    default: ['gnocchi://']
+    default: ['gnocchi://?filter_project=service&archive_policy=low']
     description: >
         A list of publishers to put in pipeline.yaml. When the
         collector is used, override this with notifier:// publisher.
@@ -97,7 +97,7 @@ parameters:
   GnocchiArchivePolicy:
     default: 'low'
     type: string
-    description: archive policy to use with gnocchi backend
+    description: (DEPRECATED) archive policy to use with gnocchi backend
   RpcPort:
     default: 5672
     description: The network port for messaging backend
@@ -117,6 +117,16 @@ parameters:
         an SSL connection to the messaging host.
     type: string
 
+parameter_groups:
+- label: deprecated
+  description: |
+   The following parameters are deprecated and will be removed. They should not
+   be relied on for new deployments. If you have concerns regarding deprecated
+   parameters, please contact the TripleO development team on IRC or the
+   OpenStack mailing list.
+  parameters:
+  - GnocchiArchivePolicy
+
 conditions:
   service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']}
 
@@ -150,10 +160,6 @@ outputs:
         ceilometer::agent::auth::auth_user_domain_name: 'Default'
         ceilometer::agent::auth::auth_project_domain_name: 'Default'
         ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
-        ceilometer::dispatcher::gnocchi::url: {get_param: [EndpointMap, GnocchiInternal, uri]}
-        ceilometer::dispatcher::gnocchi::filter_project: 'service'
-        ceilometer::dispatcher::gnocchi::archive_policy: {get_param: GnocchiArchivePolicy}
-        ceilometer::dispatcher::gnocchi::resources_definition_file: 'gnocchi_resources.yaml'
         ceilometer::notification_driver: {get_param: NotificationDriver}
         # TODO(ansmith): remove once p-t-o switches to oslo params
         ceilometer::rabbit_userid: {get_param: RpcUserName}
diff --git a/releasenotes/notes/gnocchi-archive-policy-deprecation-09c086e9a0f9af86.yaml b/releasenotes/notes/gnocchi-archive-policy-deprecation-09c086e9a0f9af86.yaml
new file mode 100644
index 0000000000..ea88a84afb
--- /dev/null
+++ b/releasenotes/notes/gnocchi-archive-policy-deprecation-09c086e9a0f9af86.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    GnocchiArchivePolicy is now deprecated. The archive policy have to be passed
+    through the PipelinePublishers/EventPipelinePublishers uris.