Merge "pacemaker remote profile support"

[apex-tripleo-heat-templates.git] / puppet / services / ceilometer-base.yaml

diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 24c71cb..a86a0cd 100644 (file)
--- 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
@@ -46,14 +46,6 @@ parameters:
     default: 0
     description: Number of workers for Ceilometer service.
     type: number
-  CeilometerStoreEvents:
-    default: false
-    description: Whether to store events in ceilometer.
-    type: boolean
-  EnableLegacyCeilometerApi:
-    default: false
-    description: Enable legacy ceilometer Api service if needed.
-    type: boolean
   EventPipelinePublishers:
     default: ['notifier://?topic=alarm.all']
     description: A list of publishers to put in event_pipeline.yaml.
@@ -101,7 +93,8 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ceilometer'
-        enable_legacy_ceilometer_api: {get_param: EnableLegacyCeilometerApi}
+              - '?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
@@ -112,7 +105,6 @@ 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'