summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-30 10:33:56 +0000
committerGerrit Code Review <review@openstack.org>2017-08-30 10:33:56 +0000
commitdb02f9eec1ad175dd733fe68c18ede5f3d25fce5 (patch)
treeb9a6f973d6feb07842b164af0248c321728ee1ca /puppet/services
parent1f3cb179b8e668f9a4e2c2307b60b4ceecd877f4 (diff)
parent46219af13603bf47c2c73fa3a290587fb8006235 (diff)
Merge "Make archive policy configurable" into stable/pike
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ceilometer-base.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index b4c361a3..cdba2d3f 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -115,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}, '']}
@@ -149,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}