openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable LoggingConfiguration by default" into stable/stein

This commit is contained in:
Zuul 2020-07-21 02:52:44 +00:00 committed by Gerrit Code Review
parent cdb0caaa21 576c067f07
commit fe867e29bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/logging-environment.yaml
View File

@ -5,6 +5,7 @@
resource_registry:
OS::TripleO::Services::Fluentd: ../deployment/deprecated/logging/fluentd-container-puppet.yaml
OS::TripleO::LoggingConfiguration: ../deployment/deprecated/logging/fluentd-config.yaml
#parameter_defaults:
@ -28,4 +29,3 @@ resource_registry:
# -----BEGIN CERTIFICATE-----
# ...certificate data here...
# -----END CERTIFICATE-----

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -250,7 +250,7 @@ resource_registry:
OS::TripleO::Services::TripleoValidations: OS::Heat::None
OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None
OS::TripleO::Services::Collectd: OS::Heat::None
OS::TripleO::LoggingConfiguration: deployment/deprecated/logging/fluentd-config.yaml
OS::TripleO::LoggingConfiguration: OS::Heat::None
OS::TripleO::Services::ManilaApi: OS::Heat::None
OS::TripleO::Services::ManilaScheduler: OS::Heat::None
OS::TripleO::Services::ManilaShare: OS::Heat::None