diff options
| author |   Lars Kellogg-Stedman <lars@redhat.com> | 2017-08-25 21:36:44 -0700 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-09-07 03:48:00 +0000 |
| commit | b5783b3be42a3f674956d1d8af5cd2bcc4f3a272 (patch) | |
| tree | feffbc37f1f40fc78fbea43a0e7eca2e0e215b1c /puppet | |
| parent | a1d2af3918c9aeded6668ecb75532c3d820fa18d (diff) | |
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)
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 3044fe39..37c1d4e5 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -16,10 +16,6 @@ parameters: type: comma_delimited_list controller_ips: type: comma_delimited_list - logging_groups: - type: json - logging_sources: - type: json service_ips: type: json service_node_names: @@ -113,8 +109,6 @@ resources: bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip} all_nodes: map_merge: - - tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources} - - tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups} - enabled_services: yaql: expression: $.data.distinct() |