From 576c067f0736af9108a7dd3c541efc63a8f0aa0d Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 3 Jun 2020 10:57:33 +0200 Subject: [PATCH] Disable LoggingConfiguration by default This patch makes it possible to avoid issues with LoggingConfiguration parameters during stack update. Closes-Bug: #1881871 Change-Id: Ie8207cd3ca40d687b374d2f9ee3129f27245d290 --- environments/logging-environment.yaml | 2 +- overcloud-resource-registry-puppet.j2.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/logging-environment.yaml b/environments/logging-environment.yaml index 2ab40e389d..b3ec6394d7 100644 --- a/environments/logging-environment.yaml +++ b/environments/logging-environment.yaml @@ -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----- - diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 6ca178fe8c..0899390715 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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