diff --git a/manifests/init.pp b/manifests/init.pp index 300f6b6e..8d98bd99 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -302,10 +302,6 @@ # # DEPRECATED PARAMETERS # -# [*verbose*] -# (Optional) Deprecated. Should the daemons log verbose messages -# Defaults to undef. -# # [*auth_uri*] # (Optional) Deprecated. Use heat::keystone::authtoken::auth_uri # Defaults to undef @@ -420,8 +416,6 @@ class heat( $auth_strategy = 'keystone', $yaql_memory_quota = $::os_service_default, $yaql_limit_iterators = $::os_service_default, - # Deprecated - $verbose = undef, $auth_uri = undef, $identity_uri = undef, $auth_plugin = undef, @@ -444,10 +438,6 @@ class heat( include ::heat::keystone::authtoken } - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $auth_uri { warning('auth_uri is deprecated, use heat::keystone::authtoken::auth_uri instead.') } diff --git a/manifests/logging.pp b/manifests/logging.pp index c367e950..2532b995 100644 --- a/manifests/logging.pp +++ b/manifests/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 heat::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -108,8 +102,6 @@ class heat::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - #Deprecated - $verbose = undef, ) { include ::heat::deps @@ -122,10 +114,6 @@ class heat::logging( $log_dir_real = pick($::heat::log_dir,$log_dir) $debug_real = pick($::heat::debug,$debug) - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'heat_config': debug => $debug_real, log_config_append => $log_config_append, diff --git a/releasenotes/notes/remove_verbose-a23fce0717d789c6.yaml b/releasenotes/notes/remove_verbose-a23fce0717d789c6.yaml new file mode 100644 index 00000000..9a865cd5 --- /dev/null +++ b/releasenotes/notes/remove_verbose-a23fce0717d789c6.yaml @@ -0,0 +1,4 @@ +--- +other: + - The verbose option was marked to be removed in Ocata, + in Newton the option was deprecated.