diff --git a/manifests/init.pp b/manifests/init.pp index 26ab481..3bdf0f7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -8,26 +8,6 @@ # (Optional) Ensure state for package # Defaults to 'present' # -# [*debug*] -# (Optional) Should the service log debug messages -# Defaults to undef -# -# [*use_syslog*] -# (Optional) Should the service use Syslog -# Defaults to undef -# -# [*use_stderr*] -# (Optional) Should the service log to stderr -# Defaults to undef -# -# [*log_facility*] -# (Optional) Syslog facility to recieve logs -# Defaults to undef -# -# [*log_dir*] -# (Optional) Directory to store logs -# Defaults to undef -# # [*data_dir*] # (Optional) Directory to store data # Defaults to '/var/cache/murano' @@ -270,11 +250,6 @@ class murano( $admin_password, $package_ensure = 'present', - $debug = undef, - $use_syslog = undef, - $use_stderr = undef, - $log_facility = undef, - $log_dir = undef, $data_dir = '/var/cache/murano', $notification_transport_url = $::os_service_default, $notification_topics = $::os_service_default, @@ -332,7 +307,6 @@ class murano( ) inherits murano::params { include ::murano::deps - include ::murano::logging include ::murano::policy include ::murano::db diff --git a/manifests/logging.pp b/manifests/logging.pp index c09b484..e27f49b 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -116,26 +116,14 @@ class murano::logging( include ::murano::deps -# NOTE(aderyugin): In order to keep backward compatibility we rely on the pick function -# to use murano:: if murano::logging:: isn't specified. - $use_syslog_real = pick($::murano::use_syslog, $use_syslog) - $use_stderr_real = pick($::murano::use_stderr, $use_stderr) - $log_facility_real = pick($::murano::log_facility, $log_facility) - if $log_dir != '' { - $log_dir_real = pick($::murano::log_dir,$log_dir) - } else { - $log_dir_real = $log_dir - } - $debug_real = pick($::murano::debug, $debug) - oslo::log { 'murano_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-4149de8c04e7a995.yaml b/releasenotes/notes/remove-deprecated-logging-4149de8c04e7a995.yaml new file mode 100644 index 0000000..83979a5 --- /dev/null +++ b/releasenotes/notes/remove-deprecated-logging-4149de8c04e7a995.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.