summaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-17 18:50:51 +0000
committerGerrit Code Review <review@openstack.org>2016-09-17 18:50:51 +0000
commitdc9c4c2ad9f8ee08d3b97f09641f580bb32c1592 (patch)
tree940c3fa289dd1856d7b8e78f51f606eb3286a605 /puppet/controller.yaml
parent4a504411a9c63eda4c16c1cdbff486453a60a5ba (diff)
parent0d9298bb8fc9903ff42e3d2402cd44e765f4c822 (diff)
Merge "Add fluentd client service"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 33ed51c0..ccb517f8 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -128,6 +128,12 @@ parameters:
type: string
description: Command which will be run whenever configuration data changes
default: os-refresh-config --timeout 14400
+ LoggingSources:
+ type: json
+ default: []
+ LoggingGroups:
+ type: comma_delimited_list
+ default: []
parameter_groups:
- label: deprecated
@@ -349,6 +355,8 @@ resources:
# Misc
tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
+ tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
+ tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
# Hook for site-specific additional pre-deployment config, e.g extra hieradata
ControllerExtraConfigPre: