aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/objectstorage-role.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-06 12:34:31 +0000
committerGerrit Code Review <review@openstack.org>2016-10-06 12:34:31 +0000
commitf9c3481c3ef3e1be5a7c86dc3717d20824745399 (patch)
tree8394ed714df72108f17e99475286d8c45f1c6ac9 /puppet/objectstorage-role.yaml
parentac3ee795d329b7b26acca4762875de4f2bbde8a5 (diff)
parentdd162f42c73cc2df5cd2d69f69b007037ca2f7a9 (diff)
Merge "restore missing fluentd client functionality"
Diffstat (limited to 'puppet/objectstorage-role.yaml')
-rw-r--r--puppet/objectstorage-role.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index 0914c912..d7681d10 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -96,12 +96,6 @@ 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: []
resources:
@@ -266,8 +260,6 @@ resources:
object:
mapped_data: # data supplied directly to this deployment configuration, etc
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}
SwiftStorageHieraDeploy: