diff --git a/manifests/init.pp b/manifests/init.pp index 68a7b8ec..6467f182 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -284,16 +284,11 @@ # Defaults to undef. # Deprecated, use rabbit_userid instead. # -# [*verbose*] -# (optional) Deprecated, Verbose logging -# Defaults to undef -# # [*enabled_drivers*] # (optional) Array of drivers to load during service # initialization. Deprecated and moved to conductor. # Defaults to undef - - +# class ironic ( $enabled = true, $package_ensure = 'present', @@ -356,7 +351,6 @@ class ironic ( $purge_config = false, # DEPRECATED PARAMETERS $rabbit_user = undef, - $verbose = undef, $enabled_drivers = undef, ) { @@ -365,10 +359,6 @@ class ironic ( include ::ironic::db include ::ironic::params - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $rabbit_user { warning('The rabbit_user parameter is deprecated. Please use rabbit_userid instead.') $rabbit_user_real = $rabbit_user diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index 0e7de253..f0ce2a48 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -85,12 +85,6 @@ # Defaults to $::os_service_default # Example: 'Y-%m-%d %H:%M:%S' # -# DEPRECATED PARAMETERS -# -# [*verbose*] -# (Optional) Deprecated, Should the daemons log verbose messages -# Defaults to undef -# class ironic::inspector::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -108,8 +102,6 @@ class ironic::inspector::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - #Deprecated - $verbose = undef, ) { include ::ironic::deps @@ -121,9 +113,6 @@ class ironic::inspector::logging( $default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',') } - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } ironic_inspector_config { 'DEFAULT/debug': value => $debug_real; diff --git a/manifests/logging.pp b/manifests/logging.pp index bc4d8c1b..c25db9d1 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -4,10 +4,6 @@ # # == parameters # -# [*verbose*] -# (Optional) Should the daemons log verbose messages -# Defaults to $::os_service_default -# # [*debug*] # (Optional) Should the daemons log debug messages # Defaults to $::os_service_default @@ -89,12 +85,6 @@ # Defaults to $::os_service_default # Example: 'Y-%m-%d %H:%M:%S' # -# DEPRECATED PARAMETERS -# -# [*verbose*] -# (Optional) Deprecated. Should the daemons log verbose messages -# Defaults to undef -# class ironic::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -112,8 +102,6 @@ class ironic::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - # Deprecated - $verbose = undef, ) { include ::ironic::deps @@ -126,10 +114,6 @@ class ironic::logging( $log_dir_real = pick($::ironic::log_dir,$log_dir) $debug_real = pick($::ironic::debug,$debug) - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'ironic_config': debug => $debug_real, use_stderr => $use_stderr_real, diff --git a/releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml b/releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml new file mode 100644 index 00000000..710e9bf4 --- /dev/null +++ b/releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml @@ -0,0 +1,5 @@ +--- +other: + - This patch removes the verbose parameter. Since we are in Ocata + and this option was marked to be removed in this release. + In Newton the option was deprecated.