Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increase libvirt/qemu.conf max_files and max_processes"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceilometer-agent-central.yaml
diff --git
a/puppet/services/ceilometer-agent-central.yaml
b/puppet/services/ceilometer-agent-central.yaml
index
5d980d7
..
b9d8966
100644
(file)
--- a/
puppet/services/ceilometer-agent-central.yaml
+++ b/
puppet/services/ceilometer-agent-central.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-04-08
+heat_template_version:
ocata
description: >
OpenStack Ceilometer Central Agent service configured with Puppet
description: >
OpenStack Ceilometer Central Agent service configured with Puppet
@@
-25,6
+25,11
@@
parameters:
MonitoringSubscriptionCeilometerCentral:
default: 'overcloud-ceilometer-agent-central'
type: string
MonitoringSubscriptionCeilometerCentral:
default: 'overcloud-ceilometer-agent-central'
type: string
+ CeilometerAgentCentralLoggingSource:
+ type: json
+ default:
+ tag: openstack.ceilometer.agent.central
+ path: /var/log/ceilometer/central.log
resources:
CeilometerServiceBase:
resources:
CeilometerServiceBase:
@@
-40,16
+45,12
@@
outputs:
value:
service_name: ceilometer_agent_central
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCentral}
value:
service_name: ceilometer_agent_central
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCentral}
+ logging_source: {get_param: CeilometerAgentCentralLoggingSource}
+ logging_groups:
+ - ceilometer
config_settings:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- - ceilometer::agent::central::coordination_url:
- list_join:
- - ''
- - - 'redis://:'
- - {get_param: RedisPassword}
- - '@'
- - "%{hiera('redis_vip')}"
- - ':6379/'
+ - ceilometer_redis_password: {get_param: RedisPassword}
step_config: |
include ::tripleo::profile::base::ceilometer::agent::central
step_config: |
include ::tripleo::profile::base::ceilometer::agent::central