summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-31 00:26:42 +0000
committerGerrit Code Review <review@openstack.org>2017-08-31 00:26:42 +0000
commit1ae1cca534c4ef9295f6755e13296b839126b920 (patch)
treebad31d9c6e271587d0505b807a3ac4bc21d97fe9
parent8c36f13f83acb275a931aa25c3246be239e70f14 (diff)
parent0eed8aa03bea4aaf02e147ef5d9b6846af2f713e (diff)
Merge "Change ManageEventPipeline to true" into stable/pike
-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.