diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-09 03:21:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-09 03:21:12 +0000 |
| commit | cacd08992ccdff72d1fb00005072fc0d0cd69343 (patch) | |
| tree | 539e84f7c51df82d466911197bcec785e0d9f0ea /ci/environments | |
| parent | f27d3a4d59413761b7b2edcef1aa620b0bd6384d (diff) | |
| parent | 2e286ecee218d325b7dea19957da1734e81d1d30 (diff) | |
Merge "Temporarily disable fluentd from scenario001-multinode-containers" into stable/pike
Diffstat (limited to 'ci/environments')
| -rw-r--r-- | ci/environments/scenario001-multinode-containers.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 546e4c4b..082541ca 100644 --- 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 |