From dd162f42c73cc2df5cd2d69f69b007037ca2f7a9 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Wed, 5 Oct 2016 09:28:59 -0400 Subject: restore missing fluentd client functionality in the great rebase following the JINJA ALL THE THINGS changes we lost critical functionality in the fluentd client service. This review restores the missing features. Change-Id: I7c23f16f81e75f3da6a24587b2eb8385b3e920a4 Closes-bug: 1630692 --- puppet/all-nodes-config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'puppet/all-nodes-config.yaml') diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 67dc056b..34ad6fc7 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -20,6 +20,10 @@ parameters: type: string controller_ips: type: comma_delimited_list + logging_groups: + type: json + logging_sources: + type: json service_ips: type: json service_node_names: @@ -79,6 +83,8 @@ resources: all_nodes: mapped_data: map_merge: + - tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources} + - tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups} - enabled_services: {get_param: enabled_services} # This writes out a mapping of service_name_enabled: 'true' # For any services not enabled, hiera foo_enabled will -- cgit 1.2.3-korg