Merge "Add fluentd client service"

diff --cc overcloud-resource-registry-puppet.yaml
Simple merge

diff --cc overcloud.j2.yaml
Simple merge

diff --cc puppet/services/ceilometer-collector.yaml
index fe1c82b,2fc9aec..4d15be8
--- 1/puppet/services/ceilometer-collector.yaml
--- 2/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

diff --cc roles_data.yaml
Simple merge