diff --git a/manifests/init.pp b/manifests/init.pp index 0c29521f..a6df7328 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -8,10 +8,6 @@ # (Optional) Ensure state for package. # Defaults to 'present' # -# [*debug*] -# (Optional) Should the daemons log debug messages -# Defaults to undef. -# # [*default_transport_url*] # (optional) A URL representing the messaging driver to use and its full # configuration. Transport URLs take the form: @@ -162,10 +158,6 @@ # (Optional) Password for message broker authentication # Defaults to $::os_service_default. # -# [*use_syslog*] -# (Optional) Use syslog for logging. -# Defaults to undef -# # [*database_connection*] # Url used to connect to database. # (Optional) Defaults to undef. @@ -195,20 +187,6 @@ # If set, use this value for max_overflow with sqlalchemy. # (Optional) Defaults to undef. # -# [*use_stderr*] -# (optional) Use stderr for logging -# Defaults to undef. -# -# [*log_facility*] -# (Optional) Syslog facility to receive log lines. -# Defaults to undef. -# -# [*log_dir*] -# (optional) Directory where logs should be stored. -# If set to boolean false or the $::os_service_default, it will not log to -# any directory. -# Defaults to '/var/log/cinder'. -# # [*storage_availability_zone*] # (optional) Availability zone of the node. # Defaults to 'nova' @@ -304,11 +282,6 @@ class cinder ( $amqp_password = $::os_service_default, $package_ensure = 'present', $api_paste_config = '/etc/cinder/api-paste.ini', - $use_syslog = undef, - $use_stderr = undef, - $log_facility = undef, - $log_dir = '/var/log/cinder', - $debug = undef, $storage_availability_zone = 'nova', $default_availability_zone = false, $allow_availability_zone_fallback = $::os_service_default, @@ -323,7 +296,6 @@ class cinder ( include ::cinder::deps include ::cinder::db - include ::cinder::logging package { 'cinder': ensure => $package_ensure, diff --git a/manifests/logging.pp b/manifests/logging.pp index bc16688d..60b72b40 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -116,26 +116,14 @@ class cinder::logging( include ::cinder::deps - # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function - # to use cinder:: if cinder::logging:: isn't specified. - $use_syslog_real = pick($::cinder::use_syslog,$use_syslog) - $use_stderr_real = pick($::cinder::use_stderr,$use_stderr) - $log_facility_real = pick($::cinder::log_facility,$log_facility) - if $log_dir != '' { - $log_dir_real = pick($::cinder::log_dir,$log_dir) - } else { - $log_dir_real = $log_dir - } - $debug_real = pick($::cinder::debug,$debug) - oslo::log { 'cinder_config': - debug => $debug_real, - use_syslog => $use_syslog_real, + debug => $debug, + use_syslog => $use_syslog, use_json => $use_json, use_journal => $use_journal, - use_stderr => $use_stderr_real, - log_dir => $log_dir_real, - syslog_log_facility => $log_facility_real, + use_stderr => $use_stderr, + log_dir => $log_dir, + syslog_log_facility => $log_facility, logging_context_format_string => $logging_context_format_string, logging_default_format_string => $logging_default_format_string, logging_debug_format_suffix => $logging_debug_format_suffix, diff --git a/releasenotes/notes/remove-deprecated-logging-28acd6cbd8d1a61a.yaml b/releasenotes/notes/remove-deprecated-logging-28acd6cbd8d1a61a.yaml new file mode 100644 index 00000000..83979a5c --- /dev/null +++ b/releasenotes/notes/remove-deprecated-logging-28acd6cbd8d1a61a.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The deprecated parameters use_syslog, use_stderr, log_facility, log_dir and + debug in the init class is now removed. Please set them in the logging class. diff --git a/spec/classes/cinder_init_spec.rb b/spec/classes/cinder_init_spec.rb index 90803491..0308122f 100644 --- a/spec/classes/cinder_init_spec.rb +++ b/spec/classes/cinder_init_spec.rb @@ -14,7 +14,6 @@ describe 'cinder' do req_params end - it { should contain_class('cinder::logging') } it { should contain_class('cinder::params') } it { should contain_class('mysql::bindings::python') }