From c13e8df1b7dc62c6a318f937b75ed6225701c8a8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 10 Nov 2021 22:03:42 +0900 Subject: [PATCH] Allow using a different syslog facility for syslog log handler Change-Id: I4ca96f7ba11401a99bf5827f17066a4f934f1e83 --- manifests/init.pp | 5 +++++ releasenotes/notes/syslog_facility-0fee14adc9a7de4f.yaml | 4 ++++ templates/local_settings.py.erb | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/syslog_facility-0fee14adc9a7de4f.yaml diff --git a/manifests/init.pp b/manifests/init.pp index f01d4f84..17c742eb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -133,6 +133,10 @@ # (optional) Log level. Defaults to 'INFO'. WARNING: Setting this to # DEBUG will let plaintext passwords be logged in the Horizon log file. # +# [*syslog_facility*] +# (optional) Syslog facility used when syslog log hander is enabled. +# Defaults to 'local1'. +# # [*local_settings_template*] # (optional) Location of template to use for local_settings.py generation. # Defaults to 'horizon/local_settings.py.erb'. @@ -558,6 +562,7 @@ class horizon( $dropdown_max_items = 30, $log_handlers = ['file'], $log_level = 'INFO', + $syslog_facility = 'local1', $help_url = 'http://docs.openstack.org', $local_settings_template = 'horizon/local_settings.py.erb', $configure_apache = true, diff --git a/releasenotes/notes/syslog_facility-0fee14adc9a7de4f.yaml b/releasenotes/notes/syslog_facility-0fee14adc9a7de4f.yaml new file mode 100644 index 00000000..5a46596f --- /dev/null +++ b/releasenotes/notes/syslog_facility-0fee14adc9a7de4f.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``horizon::syslog_facility`` parameter has been added. diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb index 1da47a2e..a7a10448 100644 --- a/templates/local_settings.py.erb +++ b/templates/local_settings.py.erb @@ -755,7 +755,7 @@ LOGGING = { <%- if @log_handlers.include?('syslog') -%> 'syslog': { 'level': '<%= @log_level %>', - 'facility': 'local1', + 'facility': '<%= @syslog_facility %>', 'class': 'logging.handlers.SysLogHandler', 'address': '/dev/log', 'formatter': 'normal',