diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-07 16:39:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-07 16:39:47 +0000 |
| commit | be67dc8a50ef5ad85fae18fc9cafe74cc19636f9 (patch) | |
| tree | 96c59b730d8ea72777f5424e6e5c8732c6c9c52d /puppet/all-nodes-config.yaml | |
| parent | 24b8d7835d2d299bc37e2f17d923fd92e5709e46 (diff) | |
| parent | b5783b3be42a3f674956d1d8af5cd2bcc4f3a272 (diff) | |
Merge "fluentd: log configuration was not generated correctly" into stable/pike
Diffstat (limited to 'puppet/all-nodes-config.yaml')
| -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() |