From: Martin André Date: Fri, 3 Nov 2017 11:26:34 +0000 (+0100) Subject: Re-enable containerized fluentd X-Git-Tag: opnfv-6.0.0~16^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b48c1148b1696d352117900102fcc9ef12628e58;p=apex-tripleo-heat-templates.git Re-enable containerized fluentd Now that we got a promotion, there is a container image for fluentd in tripleomaster registry. We can finally re-enable the containerized fluentd service in scenario0001. Change-Id: I636e63f9b66dd47267fa40febf49a6ec9a6b7ef3 Related-Bug: #1721723 Closes-Bug: #1726891 (cherry picked from commit c795e748d2e0fe1299919872250d6951246c1365) --- diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 082541ca..3ddc29c7 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -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.