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 9fc1530..140e39e 100644 (file)
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -43,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:
@@ -113,6 +115,10 @@ parameters:
     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}, '']}
@@ -147,7 +153,7 @@ 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}
@@ -168,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