Change flat network name for nosdn fdio scenario

[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 b3e2c3a..140e39e 100644 (file)
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack Ceilometer service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -39,14 +43,16 @@ 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:
-    default: ['gnocchi://']
+    default: ['gnocchi://', 'panko://']
     description: >
         A list of publishers to put in event_pipeline.yaml. When the
         collector is used, override this with notifier:// publisher.
+        If zaqar is enabled, you can also publish to a zaqar queue
+        by including "zaqar://?queue=queue_name" in this list.
         Set ManageEventPipeline to true for override to take effect.
     type: comma_delimited_list
   ManagePipeline:
@@ -64,6 +70,10 @@ parameters:
     default: ''
     description: Set to True to enable debugging on all services.
     type: string
+  CeilometerDebug:
+    default: ''
+    description: Set to True to enable debugging Ceilometer services.
+    type: string
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -99,6 +109,19 @@ parameters:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
     hidden: true
+  NotificationDriver:
+    type: string
+    default: 'messagingv2'
+    description: Driver or drivers to handle sending notifications.
+    constraints:
+      - allowed_values: [ 'messagingv2', 'noop' ]
+  GnocchiArchivePolicy:
+    default: 'low'
+    type: string
+    description: archive policy to use with gnocchi backend
+
+conditions:
+  service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']}
 
 outputs:
   role_data:
@@ -106,7 +129,11 @@ outputs:
     value:
       service_name: ceilometer_base
       config_settings:
-        ceilometer::debug: {get_param: Debug}
+        ceilometer::debug:
+          if:
+          - service_debug_unset
+          - {get_param: Debug }
+          - {get_param: CeilometerDebug }
         ceilometer::keystone::authtoken::project_name: 'service'
         ceilometer::keystone::authtoken::user_domain_name: 'Default'
         ceilometer::keystone::authtoken::project_domain_name: 'Default'
@@ -126,8 +153,9 @@ outputs:
         ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
         ceilometer::dispatcher::gnocchi::url: {get_param: [EndpointMap, GnocchiInternal, uri]}
         ceilometer::dispatcher::gnocchi::filter_project: 'service'
-        ceilometer::dispatcher::gnocchi::archive_policy: 'low'
+        ceilometer::dispatcher::gnocchi::archive_policy: {get_param: GnocchiArchivePolicy}
         ceilometer::dispatcher::gnocchi::resources_definition_file: 'gnocchi_resources.yaml'
+        ceilometer::notification_driver: {get_param: NotificationDriver}
         ceilometer::rabbit_userid: {get_param: RabbitUserName}
         ceilometer::rabbit_password: {get_param: RabbitPassword}
         ceilometer::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
@@ -146,6 +174,8 @@ outputs:
           ceilometer::keystone::auth::region: {get_param: KeystoneRegion}
           ceilometer::keystone::auth::tenant: 'service'
           ceilometer::keystone::auth::configure_endpoint: {get_param: CeilometerApiEndpoint}
+          # Enable default notification queue
+          tripleo::profile::base::keystone::ceilometer_notification_topics: ["notifications"]
         mysql:
           ceilometer::db::mysql::password: {get_param: CeilometerPassword}
           ceilometer::db::mysql::user: ceilometer