diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-10 12:11:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-10 12:11:40 +0000 |
| commit | 18d63efe385027b25809cc1c83625b82fd8d153d (patch) | |
| tree | 3ed19ad0eec951a88cdc9a0764c441640a49e888 /ci | |
| parent | d0840a512d830e30730abfaf3b3f734e61fcebd4 (diff) | |
| parent | b48c1148b1696d352117900102fcc9ef12628e58 (diff) | |
Merge "Re-enable containerized fluentd" into stable/pike
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/environments/scenario001-multinode-containers.yaml | 7 |
1 files changed, 1 insertions, 6 deletions
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. |