Merge "Temporarily disable fluentd from scenario001-multinode-containers" into stable...

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 546e4c4..082541c 100644 (file)
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -29,7 +29,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.
@@ -98,7 +100,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