openstack/puppet-horizon
Code Issues Proposed changes

Remove the deprecated horizon::log_handler parameter

Browse Source 
This parameter was deprecated during the previous cycle and replaced
by the new log_handlers parameter.

Change-Id: If89f2da5e915fef69af6667cd96f830b7b666867
This commit is contained in:
Takashi Kajinami 2021-02-12 15:56:27 +09:00
parent bd119e7519
commit 66c74785e1
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/init.pp
View File

@ -487,9 +487,6 @@
#
# DEPRECATED PARAMETERS
#
# [*log_handler*]
# (optional) Log handler. Defaults to 'file'
#
# [*horizon_cert*]
# (required with listen_ssl) Certificate to use for SSL support.
#
@ -600,7 +597,6 @@ class horizon(
$customization_module = undef,
$horizon_upload_mode = undef,
# DEPRECATED PARAMETERS
$log_handler = undef,
$horizon_cert = undef,
$horizon_key = undef,
$horizon_ca = undef,
@ -608,15 +604,6 @@ class horizon(
include horizon::deps
if $log_handler != undef {
warning('log_handler parameter was deprecated and will be removed in a future \
release. Use log_handlers instead')
$log_handlers_real = [$log_handler]
} else {
validate_legacy(Array, 'validate_array', $log_handlers)
$log_handlers_real = $log_handlers
}
if $cache_server_url and $cache_server_ip {
fail('Only one of cache_server_url or cache_server_ip can be set.')
}

4
releasenotes/notes/remove-log_handlers-62c1f89f2b7851ef.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated ``horizon::log_handler`` parameter has been removed.

28
templates/local_settings.py.erb
View File

@ -734,7 +734,7 @@ LOGGING = {
'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log',
'formatter': 'verbose',
},
<%- if @log_handlers_real.include?('syslog') -%>
<%- if @log_handlers.include?('syslog') -%>
'syslog': {
'level': '<%= @log_level %>',
'facility': 'local1',
@ -757,91 +757,91 @@ LOGGING = {
},
'horizon': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'openstack_dashboard': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'novaclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'cinderclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'keystoneclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'glanceclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'neutronclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'heatclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'troveclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'swiftclient': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'openstack_auth': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'nose.plugins.manager': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,
},
'django': {
# 'handlers': ['console'],
'handlers': ['<%= @log_handlers_real.join("', '") %>'],
'handlers': ['<%= @log_handlers.join("', '") %>'],
# 'level': 'DEBUG',
'level': '<%= @log_level %>',
'propagate': False,