Browse Source

Merge "Disable LoggingConfiguration by default" into stable/stein

changes/33/743233/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
fe867e29bc
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      environments/logging-environment.yaml
  2. +1
    -1
      overcloud-resource-registry-puppet.j2.yaml

+ 1
- 1
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-----


+ 1
- 1
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


Loading…
Cancel
Save