From 01e4cea5d229c98946864924d6d86ecf1af0593a Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Tue, 27 Sep 2016 19:46:42 -0300 Subject: [PATCH] Remove verbose Since we are in Ocata we should remove the verbose option that was deprecated Change-Id: I2b35fe30e4e5049b15e6cc58b81c8b202db56191 --- manifests/api.pp | 9 --------- manifests/conductor.pp | 12 ------------ manifests/guestagent.pp | 10 ---------- manifests/logging.pp | 12 ------------ manifests/taskmanager.pp | 9 --------- .../notes/remove_verbose-208dc449d7fe91ff.yaml | 4 ++++ 6 files changed, 4 insertions(+), 52 deletions(-) create mode 100644 releasenotes/notes/remove_verbose-208dc449d7fe91ff.yaml diff --git a/manifests/api.pp b/manifests/api.pp index 21ab0c25..33bccd2d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -138,10 +138,6 @@ # (Optional) Deprecated. Use trove::keystone::authtoken::auth_uri instead. # Defaults to undef. # -# [*verbose*] -# (optional) Deprecated. Rather to log the trove api service at verbose level. -# Defaults to undef -# # [*auth_url*] # (optional) Deprecated. Use trove::keystone::authtoken::auth_url instead. # Defaults to undef @@ -176,7 +172,6 @@ class trove::api( $keystone_user = undef, $identity_uri = undef, $auth_uri = undef, - $verbose = undef, $auth_url = undef, ) inherits trove { @@ -206,10 +201,6 @@ class trove::api( warning('keystone_password is deprecated, use trove::keystone::authtoken::auth_uri instead.') } - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $auth_url { warning('auth_url is deprecated, use trove::keystone::authtoken::auth_url instead.') } diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 51983d71..83849aec 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -58,12 +58,6 @@ # (optional) If False doesn't trace SQL requests. # Default: $::os_service_default # -# DEPRECATED PARAMETERS -# -# [*verbose*] -# (optional) Deprecated. Rather to log the trove api service at verbose level. -# Default: undef -# class trove::conductor( $enabled = true, $manage_service = true, @@ -78,17 +72,11 @@ class trove::conductor( $workers = $::processorcount, $enable_profiler = $::os_service_default, $trace_sqlalchemy = $::os_service_default, - # Deprecated - $verbose = undef, ) inherits trove { include ::trove::deps include ::trove::params - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $::trove::database_connection { if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) { require '::mysql::bindings' diff --git a/manifests/guestagent.pp b/manifests/guestagent.pp index 05167661..f6476450 100644 --- a/manifests/guestagent.pp +++ b/manifests/guestagent.pp @@ -77,11 +77,6 @@ # # DEPRECATED PARAMETERS # -# [*verbose*] -# (optional) Deprecated. Rather to log the trove -# guest agent service at verbose level. -# Default: undef -# # [*root_grant*] # (optional) Permissions to grant "root" user. # Defaults to $::os_service_default. @@ -117,17 +112,12 @@ class trove::guestagent( $root_grant_option = $::os_service_default, $default_password_length = $::os_service_default, #Deprecated - $verbose = undef, $control_exchange = undef, ) inherits trove { include ::trove::deps include ::trove::params - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - # basic service config trove_guestagent_config { 'DEFAULT/trove_auth_url': value => $auth_url; diff --git a/manifests/logging.pp b/manifests/logging.pp index de38ed14..62e947d5 100644 --- a/manifests/logging.pp +++ b/manifests/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 trove::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -114,8 +108,6 @@ class trove::logging( $instance_format = $::os_service_default, $instance_uuid_format = $::os_service_default, $log_date_format = $::os_service_default, - # Deprecated - $verbose = undef, ) { include ::trove::deps @@ -129,10 +121,6 @@ class trove::logging( $log_file_real = pick($::trove::api::log_file, $log_file) $debug_real = pick($::trove::api::debug, $debug) - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - oslo::log { 'trove_config': debug => $debug_real, use_stderr => $use_stderr_real, diff --git a/manifests/taskmanager.pp b/manifests/taskmanager.pp index 415f0f7e..f9bb730f 100644 --- a/manifests/taskmanager.pp +++ b/manifests/taskmanager.pp @@ -86,10 +86,6 @@ # (optional) Use template to provision trove guest agent configuration file. # Defaults to true. # -# [*verbose*] -# (optional) Deprecated. Rather to log the trove api service at verbose level. -# Default: undef -# class trove::taskmanager( $enabled = true, $manage_service = true, @@ -107,16 +103,11 @@ class trove::taskmanager( $taskmanager_queue = 'taskmanager', #DEPRECATED OPTIONS $use_guestagent_template = true, - $verbose = undef, ) inherits trove { include ::trove::deps include ::trove::params - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } - if $::trove::database_connection { if($::trove::database_connection =~ /mysql:\/\/\S+:\S+@\S+\/\S+/) { require '::mysql::bindings' diff --git a/releasenotes/notes/remove_verbose-208dc449d7fe91ff.yaml b/releasenotes/notes/remove_verbose-208dc449d7fe91ff.yaml new file mode 100644 index 00000000..9a865cd5 --- /dev/null +++ b/releasenotes/notes/remove_verbose-208dc449d7fe91ff.yaml @@ -0,0 +1,4 @@ +--- +other: + - The verbose option was marked to be removed in Ocata, + in Newton the option was deprecated.