From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 17 Sep 2016 18:50:51 +0000 (+0000)
Subject: Merge "Add fluentd client service"
X-Git-Tag: opnfv-6.0.0~1591
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dc9c4c2ad9f8ee08d3b97f09641f580bb32c1592;p=apex-tripleo-heat-templates.git

Merge "Add fluentd client service"
---

dc9c4c2ad9f8ee08d3b97f09641f580bb32c1592
diff --cc puppet/services/ceilometer-collector.yaml
index fe1c82b2,2fc9aec0..4d15be8e
--- a/puppet/services/ceilometer-collector.yaml
+++ b/puppet/services/ceilometer-collector.yaml
@@@ -43,9 -41,10 +48,12 @@@ outputs
      value:
        service_name: ceilometer_collector
        monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCollector}
+       logging_source: {get_param: CeilometerCollectorLoggingSource}
+       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]
        step_config: |
          include ::tripleo::profile::base::ceilometer::collector