Remove verbose
Since we are in Ocata we should remove the verbose option that was deprecated Change-Id: I454aa625c5b0c4139309962dd4c1088dd52ef749
This commit is contained in:
parent
88713c96f7
commit
8684c85d12
|
@ -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.')
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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')
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
other:
|
||||
- The verbose option was marked to be removed in Ocata,
|
||||
in Newton the option was deprecated.
|
Loading…
Reference in New Issue