aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2017-10-24 16:49:10 +0200
committerSofer Athlan-Guyot <sathlang@redhat.com>2017-11-08 16:36:32 +0100
commit2e286ecee218d325b7dea19957da1734e81d1d30 (patch)
treeb399359c3a5b5fa8fc02bcdd9e9e326c981466a6
parent0e5347ad7f160743aead7dd8dded91fb7d72c3ff (diff)
Temporarily disable fluentd from scenario001-multinode-containers
Mixing containers and BM is currently not working. Once the master promotion will take place we will have a fluentd container and can readd fluentd as a container and the problem should not re-occurr. Change-Id: Iad97f7e0e4de56f46a46d2381fc1ea5822a2114a Related-Bug: #1726891 (cherry picked from commit 35d91ddc6d11bb2696321fff4593d5cca3b0cba8)
-rw-r--r--ci/environments/scenario001-multinode-containers.yaml8
1 files changed, 6 insertions, 2 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index de265263..63c234bc 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -16,7 +16,9 @@ resource_registry:
# FIXME(mandre) fluentd container image missing from tripleomaster registry
# https://bugs.launchpad.net/tripleo/+bug/1721723
# OS::TripleO::Services::FluentdClient: ../../docker/services/fluentd-client.yaml
- OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
+ # FIXME(mandre/bandini) mixing BM fluentd and containers is problematic
+ # https://bugs.launchpad.net/tripleo/+bug/1726891
+ # OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml
# Some infra instances don't pass the ping test but are otherwise working.
# Since the OVB jobs also test this functionality we can shut it off here.
@@ -85,7 +87,9 @@ parameter_defaults:
- OS::TripleO::Services::Congress
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
- - OS::TripleO::Services::FluentdClient
+ # FIXME(mandre/bandini) mixing BM fluentd and containers is problematic
+ # https://bugs.launchpad.net/tripleo/+bug/1726891
+ #- OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::Iscsid