X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-base.yaml;h=a86a0cdf448883dcf686ec6d4af688fd279a2974;hb=38ac78ba5d302b9d99009336d80a7f19c938826b;hp=ded1bc030523766cb9b135df5ee8732c3c6b5672;hpb=56c98446e7def74d898a2e38427ab93e625ab89b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index ded1bc03..a86a0cdf 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Ceilometer service configured with Puppet
@@ -31,9 +31,9 @@ parameters:
     type: string
     hidden: true
   CeilometerMeterDispatcher:
-    default: 'gnocchi'
-    description: Dispatcher to process meter data
-    type: string
+    default: ['gnocchi']
+    description: Comma-seperated list of Dispatcher to process meter data
+    type: comma_delimited_list
     constraints:
     - allowed_values: ['gnocchi', 'database']
   CeilometerEventDispatcher:
@@ -46,10 +46,10 @@ parameters:
     default: 0
     description: Number of workers for Ceilometer service.
     type: number
-  CeilometerStoreEvents:
-    default: false
-    description: Whether to store events in ceilometer.
-    type: boolean
+  EventPipelinePublishers:
+    default: ['notifier://?topic=alarm.all']
+    description: A list of publishers to put in event_pipeline.yaml.
+    type: comma_delimited_list
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
@@ -93,6 +93,8 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ceilometer'
+              - '?bind_address='
+              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
         ceilometer_backend: {get_param: CeilometerBackend}
         ceilometer::metering_secret: {get_param: CeilometerMeteringSecret}
         # we include db_sync class in puppet-tripleo
@@ -103,7 +105,7 @@ outputs:
         ceilometer::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         ceilometer::agent::auth::auth_password: {get_param: CeilometerPassword}
         ceilometer::agent::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
-        ceilometer::agent::notification::store_events: {get_param: CeilometerStoreEvents}
+        ceilometer::agent::notification::event_pipeline_publishers: {get_param: EventPipelinePublishers}
         ceilometer::agent::auth::auth_region: {get_param: KeystoneRegion}
         ceilometer::agent::auth::auth_tenant_name: 'service'
         ceilometer::agent::auth::auth_endpoint_type: 'internalURL'