From 8684c85d12f77f92fb4627ed740a058d04ca78bc Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Tue, 27 Sep 2016 20:33:00 -0300 Subject: [PATCH] Remove verbose Since we are in Ocata we should remove the verbose option that was deprecated Change-Id: I454aa625c5b0c4139309962dd4c1088dd52ef749 --- manifests/api.pp | 9 --------- manifests/api/logging.pp | 12 ------------ manifests/cache/logging.pp | 13 ------------- manifests/glare/logging.pp | 12 ------------ manifests/registry.pp | 8 -------- manifests/registry/logging.pp | 12 ------------ .../notes/remove_verbose-228877cddeed6640.yaml | 4 ++++ 7 files changed, 4 insertions(+), 66 deletions(-) create mode 100644 releasenotes/notes/remove_verbose-228877cddeed6640.yaml diff --git a/manifests/api.pp b/manifests/api.pp index f3dd5939..d3c92521 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -256,10 +256,6 @@ # Defaults to false. # Example: ['file','http'] # -# [*verbose*] -# (optional) Deprecated. Rather to log the glance api service at verbose level. -# Default: undef -# # [*auth_region*] # (optional) The region for the authentication service. # If "use_user_token" is not in effect and using keystone auth, @@ -370,7 +366,6 @@ class glance::api( $validation_options = {}, # DEPRECATED PARAMETERS $known_stores = false, - $verbose = undef, $auth_region = undef, $keystone_password = undef, $auth_type = undef, @@ -389,10 +384,6 @@ class glance::api( include ::glance::api::logging include ::glance::cache::logging - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $auth_region { warning('auth_region is deprecated, has no effect and and will be removed in the O release.') } diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp index cc6c8acd..82c0bce3 100644 --- a/manifests/api/logging.pp +++ b/manifests/api/logging.pp @@ -90,12 +90,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 glance::api::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -114,8 +108,6 @@ class glance::api::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - # Deprecated - $verbose = undef, ) { include ::glance::deps @@ -129,10 +121,6 @@ class glance::api::logging( $log_file_real = pick($::glance::api::log_file,$log_file) $debug_real = pick($::glance::api::debug,$debug) - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'glance_api_config': debug => $debug_real, use_stderr => $use_stderr_real, diff --git a/manifests/cache/logging.pp b/manifests/cache/logging.pp index 7592700e..08fa5de1 100644 --- a/manifests/cache/logging.pp +++ b/manifests/cache/logging.pp @@ -89,13 +89,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 glance::cache::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -114,8 +107,6 @@ class glance::cache::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - # Deprecated - $verbose = undef, ) { include ::glance::deps @@ -126,10 +117,6 @@ class glance::cache::logging( $log_dir_real = pick($::glance::api::log_dir,$log_dir) $debug_real = pick($::glance::api::debug,$debug) - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'glance_cache_config': debug => $debug_real, use_stderr => $use_stderr_real, diff --git a/manifests/glare/logging.pp b/manifests/glare/logging.pp index eafa4baa..0785a4a0 100644 --- a/manifests/glare/logging.pp +++ b/manifests/glare/logging.pp @@ -89,12 +89,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 glance::glare::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -113,16 +107,10 @@ class glance::glare::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - # Deprecated - $verbose = undef, ) { include ::glance::deps - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'glance_glare_config': debug => $debug, use_stderr => $use_stderr, diff --git a/manifests/registry.pp b/manifests/registry.pp index 607f7993..3ddf9ca5 100644 --- a/manifests/registry.pp +++ b/manifests/registry.pp @@ -119,9 +119,6 @@ # # DEPRECATED PARAMETERS # -# [*verbose*] -# (optional) Deprecated. Enable verbose logs (true|false). Defaults to undef. -# # [*keystone_password*] # (optional) The keystone password for administrative user. # Deprecated and will be replaced by ::glance::registry::authtoken::password @@ -198,7 +195,6 @@ class glance::registry( $sync_db = true, $os_region_name = $::os_service_default, # Deprecated - $verbose = undef, $keystone_password = undef, $auth_type = undef, $auth_uri = undef, @@ -214,10 +210,6 @@ class glance::registry( include ::glance::registry::logging include ::glance::registry::db - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $keystone_password { warning('glance::registry::keystone_password is deprecated, please use glance::registry::authtoken::password') } diff --git a/manifests/registry/logging.pp b/manifests/registry/logging.pp index ccba9cae..f3e6f823 100644 --- a/manifests/registry/logging.pp +++ b/manifests/registry/logging.pp @@ -90,12 +90,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 glance::registry::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -114,8 +108,6 @@ class glance::registry::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - # Deprecated - $verbose = undef, ) { include ::glance::deps @@ -129,10 +121,6 @@ class glance::registry::logging( $log_file_real = pick($::glance::registry::log_file,$log_file) $debug_real = pick($::glance::registry::debug,$debug) - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'glance_registry_config': debug => $debug_real, use_stderr => $use_stderr_real, diff --git a/releasenotes/notes/remove_verbose-228877cddeed6640.yaml b/releasenotes/notes/remove_verbose-228877cddeed6640.yaml new file mode 100644 index 00000000..9a865cd5 --- /dev/null +++ b/releasenotes/notes/remove_verbose-228877cddeed6640.yaml @@ -0,0 +1,4 @@ +--- +other: + - The verbose option was marked to be removed in Ocata, + in Newton the option was deprecated.