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
Introduce role-specific NodeUserData, use for docker
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceilometer-collector.yaml
diff --git
a/puppet/services/ceilometer-collector.yaml
b/puppet/services/ceilometer-collector.yaml
index
2fc9aec
..
e3f1ef4
100644
(file)
--- a/
puppet/services/ceilometer-collector.yaml
+++ b/
puppet/services/ceilometer-collector.yaml
@@
-35,6
+35,13
@@
resources:
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
+ MongoDbBase:
+ type: ./database/mongodb-base.yaml
+ properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
+ EndpointMap: {get_param: EndpointMap}
+
outputs:
role_data:
description: Role data for the Ceilometer Collector role.
outputs:
role_data:
description: Role data for the Ceilometer Collector role.
@@
-45,6
+52,10
@@
outputs:
logging_groups:
- ceilometer
config_settings:
logging_groups:
- ceilometer
config_settings:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
+ map_merge:
+ - get_attr: [MongoDbBase, role_data, config_settings]
+ - get_attr: [CeilometerServiceBase, role_data, config_settings]
+ service_config_settings:
+ get_attr: [CeilometerServiceBase, role_data, service_config_settings]
step_config: |
include ::tripleo::profile::base::ceilometer::collector
step_config: |
include ::tripleo::profile::base::ceilometer::collector