diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-09-14 16:48:01 -0400 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2016-09-16 15:47:56 +0000 |
| commit | 58426256081da6f73e61bdcb824905e8598f80a5 (patch) | |
| tree | afcbd9c43c01482357118c814a8fdf7dda058309 /puppet/services | |
| parent | a54f512a201d6ec02729e7c278cce157ee187ec1 (diff) | |
Add mongo config settings in collector service templates
In scenario where mongo and collector are on separate nodes like as
indicated in the bug, collector should be able to access mongo replset
and other hiera data.
Closes-bug: #1620468
Depends-On: I0bcd0d063a7a766483426fdd5ea81cbe1dfaa348
Change-Id: Iadf4c78fb03da183d19e93c30f78817a3cfed425
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/ceilometer-collector.yaml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml index 9dbb2759..fe1c82b2 100644 --- a/puppet/services/ceilometer-collector.yaml +++ b/puppet/services/ceilometer-collector.yaml @@ -30,6 +30,13 @@ resources: 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. @@ -37,6 +44,8 @@ outputs: service_name: ceilometer_collector monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCollector} 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] step_config: | include ::tripleo::profile::base::ceilometer::collector |