From 64903dc23d39c4dc0f25263dce2a26528216356b Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Thu, 6 Apr 2017 17:45:12 -0400
Subject: [PATCH] Update default event publisher

In pike, the default publisher is gnocchi. Lets use that
as the default. If you are using collector the override
this to notifier:// instead.

Change-Id: Ic6ba909c873bee801843718cc25974abeda9f857
---
 manifests/agent/notification.pp                               | 4 ++--
 .../update-default-event-publisher-623aff98f426e60f.yaml      | 4 ++++
 spec/classes/ceilometer_agent_notification_spec.rb            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/update-default-event-publisher-623aff98f426e60f.yaml

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 6e95526e..b1fccd13 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -65,7 +65,7 @@
 #   (Optional) A list of publishers to put in event_pipeline.yaml
 #   Add 'notifier://?topic=alarm.all' to the list if you are using Aodh
 #   for alarms.
-#   Defaults to ['notifier://'],
+#   Defaults to ['gnocchi://'],
 #
 class ceilometer::agent::notification (
   $manage_service            = true,
@@ -77,7 +77,7 @@ class ceilometer::agent::notification (
   $messaging_urls            = $::os_service_default,
   $package_ensure            = 'present',
   $manage_event_pipeline     = false,
-  $event_pipeline_publishers = ['notifier://'],
+  $event_pipeline_publishers = ['gnocchi://'],
 ) {
 
   include ::ceilometer::deps
diff --git a/releasenotes/notes/update-default-event-publisher-623aff98f426e60f.yaml b/releasenotes/notes/update-default-event-publisher-623aff98f426e60f.yaml
new file mode 100644
index 00000000..d2d62214
--- /dev/null
+++ b/releasenotes/notes/update-default-event-publisher-623aff98f426e60f.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Update the default event publisher to be gnocchi://. This is the
+    default upstream.
diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb
index 0c0d905d..03b5a499 100644
--- a/spec/classes/ceilometer_agent_notification_spec.rb
+++ b/spec/classes/ceilometer_agent_notification_spec.rb
@@ -136,7 +136,7 @@ describe 'ceilometer::agent::notification' do
           "      transformers:",
           "      triggers:",
           "      publishers:",
-          "          - notifier://",
+          "          - gnocchi://",
       ])}
     end