openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Temporarily disable fluentd from scenario001-multinode-containers"

Browse Source
This commit is contained in:
Zuul 2017-10-28 08:25:22 +00:00 committed by Gerrit Code Review
commit 89fa14c480
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/environments/scenario001-multinode-containers.yaml
View File

@ -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.
@ -97,7 +99,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