openstack/openstack-ansible-rsyslog_client
Code Issues Proposed changes

Merge "Fix config generated for rsyslog_client_log_files"

Browse Source
This commit is contained in:
Jenkins 2016-06-20 00:36:17 +00:00 committed by Gerrit Code Review
commit db623504c1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/rsyslog_client_post_install.yml
View File

@ -50,8 +50,7 @@
- name: Union the log files
set_fact:
rsyslog_client_log_files: "{{ log_files.stdout_lines | union(rsyslog_client_log_files) }}"
when: log_files.stdout_lines is defined
rsyslog_client_all_log_files: "{{ log_files.stdout_lines | default([]) | union(rsyslog_client_log_files) }}"
tags:
- rsyslog-client-config
@ -61,7 +60,7 @@
dest: "/etc/rsyslog.d/{{ rsyslog_client_config_name }}"
owner: "root"
group: "root"
when: (rsyslog_client_log_files | length) > 0
when: (rsyslog_client_all_log_files | length) > 0
tags:
- rsyslog-client-config
@ -71,7 +70,7 @@
dest: "/etc/logrotate.d/{{ rsyslog_client_log_rotate_file }}"
owner: "root"
group: "root"
when: (rsyslog_client_log_files | length) > 0
when: (rsyslog_client_all_log_files | length) > 0
tags:
- rsyslog-client-config

2
templates/99-rsyslog.conf.j2
View File

@ -45,7 +45,7 @@ $ActionResumeRetryCount 250
{% endif %}
# Log files
{% for log_file in rsyslog_client_log_files %}
{% for log_file in rsyslog_client_all_log_files %}
$InputFileName {{ log_file }}
$InputFileTag {{ log_file.split('.log')[0] | basename }}:
$InputFileStateFile state-{{ log_file.split('.log')[0] | basename }}

2
templates/os_aggregate_storage.j2
View File

@ -1,4 +1,4 @@
{% for log_file in rsyslog_client_log_files %}
{% for log_file in rsyslog_client_all_log_files %}
{{ log_file }}
{% endfor %}
{