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/controller-role.yaml | |
parent | ac3ee795d329b7b26acca4762875de4f2bbde8a5 (diff) | |
parent | dd162f42c73cc2df5cd2d69f69b007037ca2f7a9 (diff) |
Merge "restore missing fluentd client functionality"
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index e18126fa..b1433b04 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -128,12 +128,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: [] parameter_groups: - label: deprecated @@ -355,8 +349,6 @@ 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: |