Merge "Upgrade scripts to migrate aodh alarm data"

[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 caf8e17..59b4cc2 100644 (file)
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -9,9 +9,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  RedisVirtualIPUri:
-    type: string
-    default: ''
   CeilometerBackend:
     default: 'mongodb'
     description: The ceilometer backend type.
@@ -38,10 +35,10 @@ parameters:
     default: false
     description: Whether to store events in ceilometer.
     type: boolean
-  RedisPassword:
-    description: The password for the redis service account.
+  Debug:
+    default: ''
+    description: Set to True to enable debugging on all services.
     type: string
-    hidden: true
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -69,16 +66,10 @@ outputs:
   role_data:
     description: Role data for the Ceilometer role.
     value:
+      service_name: ceilometer_base
       config_settings:
-        ceilometer_coordination_url:
-          list_join:
-            - ''
-            - - 'redis://:'
-              - {get_param: RedisPassword}
-              - '@'
-              - {get_param: RedisVirtualIPUri}
-              - ':6379/'
-        ceilometer_dsn: &ceilometer_dsn
+        ceilometer::debug: {get_param: Debug}
+        ceilometer::db::database_connection:
           list_join:
             - ''
             - - {get_param: [EndpointMap, MysqlInternal, protocol]}
@@ -87,18 +78,20 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ceilometer'
-        ceilometer_password: {get_param: CeilometerPassword}
         ceilometer_backend: {get_param: CeilometerBackend}
         ceilometer::metering_secret: {get_param: CeilometerMeteringSecret}
-        ceilometer::db::database_connection: *ceilometer_dsn
-        ceilometer::api::keystone_password: {get_param: ceilometer_password}
+        # we include db_sync class in puppet-tripleo
+        ceilometer::db::sync_db: false
+        ceilometer::api::keystone_password: {get_param: CeilometerPassword}
         ceilometer::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
         ceilometer::api::keystone_identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
-        ceilometer::agent::auth::auth_password: {get_param: ceilometer_password}
-        ceilometer::agent::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri] }
-        ceilometer::agent::central::coordination_url: {get_param: ceilometer_coordination_url}
+        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::db::mysql::password: {get_param: ceilometer_password}
+        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}
         ceilometer::collector::meter_dispatcher: {get_param: CeilometerMeterDispatcher}
         ceilometer::dispatcher::gnocchi::url: {get_param: [EndpointMap, GnocchiInternal, uri]}
         ceilometer::dispatcher::gnocchi::filter_project: 'service'
@@ -107,9 +100,20 @@ outputs:
         ceilometer::keystone::auth::public_url: {get_param: [EndpointMap, CeilometerPublic, uri]}
         ceilometer::keystone::auth::internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]}
         ceilometer::keystone::auth::admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]}
-        ceilometer::keystone::auth::password: {get_param: ceilometer_password}
+        ceilometer::keystone::auth::password: {get_param: CeilometerPassword}
         ceilometer::keystone::auth::region: {get_param: KeystoneRegion}
+        ceilometer::keystone::auth::tenant: 'service'
         ceilometer::rabbit_userid: {get_param: RabbitUserName}
         ceilometer::rabbit_password: {get_param: RabbitPassword}
         ceilometer::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         ceilometer::rabbit_port: {get_param: RabbitClientPort}
+        ceilometer::db::mysql::user: ceilometer
+        ceilometer::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+        ceilometer::db::mysql::dbname: ceilometer
+        ceilometer::db::mysql::allowed_hosts:
+          - '%'
+          - "%{hiera('mysql_bind_host')}"
+        ceilometer::rabbit_heartbeat_timeout_threshold: 60
+        ceilometer::db::database_db_max_retries: -1
+        ceilometer::db::database_max_retries: -1
+        ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}