fluentd: log configuration was not generated correctly
authorLars Kellogg-Stedman <lars@redhat.com>
Sat, 26 Aug 2017 04:36:44 +0000 (21:36 -0700)
committerEmilien Macchi <emilien@redhat.com>
Thu, 7 Sep 2017 03:48:00 +0000 (03:48 +0000)
commitb5783b3be42a3f674956d1d8af5cd2bcc4f3a272
treefeffbc37f1f40fc78fbea43a0e7eca2e0e215b1c
parenta1d2af3918c9aeded6668ecb75532c3d820fa18d
fluentd: log configuration was not generated correctly

fluentd hiera elements were being set in all_nodes.json, but then were
overwritten by values in <role>.json (e.g., controller.json). This
commit removes the values from all-nodes.json and ensures that they
are set correctly in <role>.json.

Closes-Bug: #1713240
Change-Id: I2b4c74c2a807f8e2fed57112f06b3791701bbe95
(cherry picked from commit d9db0c5f4f0fb07832e54b1c7fd7f5c8bfd4134e)
overcloud.j2.yaml
puppet/all-nodes-config.yaml