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 "Specify the Ceph packages to be installed"
[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
294e7dd
..
c4abc30
100644
(file)
--- a/
puppet/services/ceilometer-agent-central.yaml
+++ b/
puppet/services/ceilometer-agent-central.yaml
@@
-4,6
+4,15
@@
description: >
OpenStack Ceilometer Central Agent service configured with Puppet
parameters:
OpenStack Ceilometer Central Agent service configured with Puppet
parameters:
+ ServiceNetMap:
+ default: {}
+ description: Mapping of service_name -> network name. Typically set
+ via parameter_defaults in the resource registry. This
+ mapping overrides those in ServiceNetMapDefaults.
+ type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-13,31
+22,35
@@
parameters:
description: The password for the redis service account.
type: string
hidden: true
description: The password for the redis service account.
type: string
hidden: true
- RedisVirtualIPUri:
+ MonitoringSubscriptionCeilometerCentral:
+ default: 'overcloud-ceilometer-agent-central'
type: string
type: string
- default: ''
-
+ CeilometerAgentCentralLoggingSource:
+ type: json
+ default:
+ tag: openstack.ceilometer.agent.central
+ path: /var/log/ceilometer/central.log
resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Ceilometer Central Agent role.
value:
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Ceilometer Central Agent role.
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}
- - '@'
- - {get_param: RedisVirtualIPUri}
- - ':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