diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-06 12:34:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-06 12:34:31 +0000 |
| commit | f9c3481c3ef3e1be5a7c86dc3717d20824745399 (patch) | |
| tree | 8394ed714df72108f17e99475286d8c45f1c6ac9 /puppet/all-nodes-config.yaml | |
| parent | ac3ee795d329b7b26acca4762875de4f2bbde8a5 (diff) | |
| parent | dd162f42c73cc2df5cd2d69f69b007037ca2f7a9 (diff) | |
Merge "restore missing fluentd client functionality"
Diffstat (limited to 'puppet/all-nodes-config.yaml')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index cddd99d5..cae60aab 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: @@ -81,6 +85,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 |