aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-08-28 08:00:02 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2017-08-30 13:13:22 +0000
commit0eed8aa03bea4aaf02e147ef5d9b6846af2f713e (patch)
tree2d61a1d73ab8446dd2feed583e6930a34056024b
parentd772eb77273402a54503906ff40d2d8aa0dc5630 (diff)
Change ManageEventPipeline to true
Since the event pipeline publisher defaults in the heat templates are different from what puppet sets. We need to have the Manage to true so override takes effect. Without this we keep defaulting back to puppet defaults. We can flip this back to false once panko:// is droppped as a supported option from the pipeline. Change-Id: I2248c165783dddfb4cb7cf5644884dd8f6e6ed63 (cherry picked from commit 941b5d6797ea54afbc7b822ee045ce1186627e7c)
-rw-r--r--puppet/services/ceilometer-base.yaml2
-rw-r--r--releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml6
2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index cdba2d3f..55ee9675 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -43,7 +43,7 @@ parameters:
description: Number of workers for Ceilometer service.
type: number
ManageEventPipeline:
- default: false
+ default: true
description: Whether to manage event_pipeline.yaml.
type: boolean
EventPipelinePublishers:
diff --git a/releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml b/releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml
new file mode 100644
index 00000000..f0e43323
--- /dev/null
+++ b/releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - Change the default ManageEventPipeline to true. This is because we want
+ the event pipeline publishers overridden by heat templates to take
+ effect over the puppet defaults. Once we drop panko:// from the pipeline
+ we can switch this back to false.