summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJuan Badia Payno <jbadiapa@redhat.com>2017-05-23 09:36:15 +0200
committerMartin Mágr <mmagr@redhat.com>2017-10-09 11:31:04 +0200
commitd4efa0c39a08d28dc298290110ee5e418162f45d (patch)
tree91713c575a9259a256644d1060ad1e48f5ac18ce /ci
parent6fea40f786a466802503c03b2b815d05676e1807 (diff)
Containerized Fluentd client
Change-Id: Ia350e4899aa499cf27efffd9d2243e7e95fa1d65 Depends-On: I60796063fa9ebe0d98030fb982d22dabe2593ea0 Depends-On: I585b6877074353b5de62e5efaabfbe62432c473d (cherry picked from commit f37fe4f903f429b43d22b485c29547f576ec7269)
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario001-multinode-containers.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 0429a4b4..cbbc5216 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -13,7 +13,9 @@ resource_registry:
OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
- # TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/
+ # 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
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml
# Some infra instances don't pass the ping test but are otherwise working.