Remove verbose

Since we are in Ocata we should remove the
verbose option that was deprecated

Change-Id: I2b35fe30e4e5049b15e6cc58b81c8b202db56191
This commit is contained in:
Iury Gregory Melo Ferreira 2016-09-27 19:46:42 -03:00
parent ec4b0488a7
commit 01e4cea5d2
6 changed files with 4 additions and 52 deletions

View File

@ -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.')
}

View File

@ -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'

View File

@ -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;

View File

@ -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,

View File

@ -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'

View File

@ -0,0 +1,4 @@
---
other:
- The verbose option was marked to be removed in Ocata,
in Newton the option was deprecated.