openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Re-enable containerized fluentd"

Browse Source
This commit is contained in:
Zuul 2017-11-05 07:23:43 +00:00 committed by Gerrit Code Review
commit 6d089f85b6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,7 @@ resource_registry:
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostPuppetRestart: ../../extraconfig/tasks/post_puppet_pacemaker_restart.yaml
# 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
# 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::FluentdClient: ../../docker/services/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.