openstack
/
fuel-agent
Code Issues Proposed changes

Use same rsyslog config files for remote logging 

The cloud-init should use the same filenames for the rsyslog remote
logging as used in the fuel-library templates which would be
overwritten during the deployment by the puppet. This is partially
fix the problem with duplicate messages sent from slave nodes to the
Fuel master node rsyslog.

Change-Id: Ib95db5545889e8ae2b86dcf787c4adb7413d5698
Partial-Bug: #1579081
Partial-Bug: #1580200
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
Maksim Malchuk 2016-05-10 13:34:49 +03:00
parent b54d0412a3
commit 9967f88e0a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-init-templates/cloud_config_centos.jinja2
View File

@ -25,7 +25,7 @@ fqdn: {{ common.fqdn }}
# add entries to rsyslog configuration
rsyslog:
- filename: 10-log2master.conf
- filename: 00-remote.conf
content: |
$template LogToMaster, "<%PRI%>1 %$NOW%T%TIMESTAMP:8:$%Z %HOSTNAME% %APP-NAME% %PROCID% %MSGID% -%msg%\n"
*.* @{{ common.master_ip }};LogToMaster

2
cloud-init-templates/cloud_config_ubuntu.jinja2
View File

@ -39,7 +39,7 @@ fqdn: {{ common.fqdn }}
# add entries to rsyslog configuration
rsyslog:
- filename: 10-log2master.conf
- filename: 00-remote.conf
content: |
$template LogToMaster, "<%PRI%>1 %$NOW%T%TIMESTAMP:8:$%Z %HOSTNAME% %APP-NAME% %PROCID% %MSGID% -%msg%\n"
*.* @{{ common.master_ip }};LogToMaster