Merge "Move setting of Glance's keystone region to API profile"

[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 4ba3afc..5342cef 100644 (file)
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -62,7 +62,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer role.
     value:
-      service_name: ceilometer-base
+      service_name: ceilometer_base
       config_settings:
         ceilometer::db::database_connection:
           list_join:
@@ -83,7 +83,7 @@ outputs:
         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::auth::auth_region: 'regionOne'
+        ceilometer::agent::auth::auth_region: {get_param: KeystoneRegion}
         ceilometer::agent::auth::auth_tenant_name: 'service'
         ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
         ceilometer::db::mysql::password: {get_param: CeilometerPassword}
@@ -109,3 +109,5 @@ outputs:
           - '%'
           - "%{hiera('mysql_bind_host')}"
         ceilometer::rabbit_heartbeat_timeout_threshold: 60
+        ceilometer::db::database_db_max_retries: -1
+        ceilometer::db::database_max_retries: -1