From 9967f88e0ad8c68150c05c86af946056f87cc93d Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Tue, 10 May 2016 13:34:49 +0300 Subject: [PATCH] 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 --- cloud-init-templates/cloud_config_centos.jinja2 | 2 +- cloud-init-templates/cloud_config_ubuntu.jinja2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-init-templates/cloud_config_centos.jinja2 b/cloud-init-templates/cloud_config_centos.jinja2 index 1401c584..851d89f5 100644 --- a/cloud-init-templates/cloud_config_centos.jinja2 +++ b/cloud-init-templates/cloud_config_centos.jinja2 @@ -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 diff --git a/cloud-init-templates/cloud_config_ubuntu.jinja2 b/cloud-init-templates/cloud_config_ubuntu.jinja2 index 8ba11a22..835dbcdf 100644 --- a/cloud-init-templates/cloud_config_ubuntu.jinja2 +++ b/cloud-init-templates/cloud_config_ubuntu.jinja2 @@ -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