diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-17 09:33:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-17 09:33:38 +0000 |
| commit | 109497552b557f8744d0033947ad43dfc8eccb70 (patch) | |
| tree | a31af6f2f509543d7995ea65327cb020dc4789bd /puppet | |
| parent | 430db61b817d8e276e3986777fe96a66546c5222 (diff) | |
| parent | 58426256081da6f73e61bdcb824905e8598f80a5 (diff) | |
Merge "Add mongo config settings in collector service templates"
Diffstat (limited to 'puppet')
| -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 |