Remove verbose
Since we are in Ocata we should remove the verbose option that was deprecated Change-Id: Ibd066842d0c9f825c3f7a0220c58e003f4ee2d2e
This commit is contained in:
parent
27651d4b62
commit
1467ac82ab
@ -284,16 +284,11 @@
|
|||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
# Deprecated, use rabbit_userid instead.
|
# Deprecated, use rabbit_userid instead.
|
||||||
#
|
#
|
||||||
# [*verbose*]
|
|
||||||
# (optional) Deprecated, Verbose logging
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*enabled_drivers*]
|
# [*enabled_drivers*]
|
||||||
# (optional) Array of drivers to load during service
|
# (optional) Array of drivers to load during service
|
||||||
# initialization. Deprecated and moved to conductor.
|
# initialization. Deprecated and moved to conductor.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
|
#
|
||||||
|
|
||||||
class ironic (
|
class ironic (
|
||||||
$enabled = true,
|
$enabled = true,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
@ -356,7 +351,6 @@ class ironic (
|
|||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$rabbit_user = undef,
|
$rabbit_user = undef,
|
||||||
$verbose = undef,
|
|
||||||
$enabled_drivers = undef,
|
$enabled_drivers = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
@ -365,10 +359,6 @@ class ironic (
|
|||||||
include ::ironic::db
|
include ::ironic::db
|
||||||
include ::ironic::params
|
include ::ironic::params
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $rabbit_user {
|
if $rabbit_user {
|
||||||
warning('The rabbit_user parameter is deprecated. Please use rabbit_userid instead.')
|
warning('The rabbit_user parameter is deprecated. Please use rabbit_userid instead.')
|
||||||
$rabbit_user_real = $rabbit_user
|
$rabbit_user_real = $rabbit_user
|
||||||
|
@ -85,12 +85,6 @@
|
|||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
# Example: 'Y-%m-%d %H:%M:%S'
|
# Example: 'Y-%m-%d %H:%M:%S'
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*verbose*]
|
|
||||||
# (Optional) Deprecated, Should the daemons log verbose messages
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class ironic::inspector::logging(
|
class ironic::inspector::logging(
|
||||||
$use_syslog = $::os_service_default,
|
$use_syslog = $::os_service_default,
|
||||||
$use_stderr = $::os_service_default,
|
$use_stderr = $::os_service_default,
|
||||||
@ -108,8 +102,6 @@ class ironic::inspector::logging(
|
|||||||
$instance_format = $::os_service_default,
|
$instance_format = $::os_service_default,
|
||||||
$instance_uuid_format = $::os_service_default,
|
$instance_uuid_format = $::os_service_default,
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
#Deprecated
|
|
||||||
$verbose = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::ironic::deps
|
include ::ironic::deps
|
||||||
@ -121,9 +113,6 @@ class ironic::inspector::logging(
|
|||||||
$default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',')
|
$default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',')
|
||||||
}
|
}
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
|
|
||||||
ironic_inspector_config {
|
ironic_inspector_config {
|
||||||
'DEFAULT/debug': value => $debug_real;
|
'DEFAULT/debug': value => $debug_real;
|
||||||
|
@ -4,10 +4,6 @@
|
|||||||
#
|
#
|
||||||
# == parameters
|
# == parameters
|
||||||
#
|
#
|
||||||
# [*verbose*]
|
|
||||||
# (Optional) Should the daemons log verbose messages
|
|
||||||
# Defaults to $::os_service_default
|
|
||||||
#
|
|
||||||
# [*debug*]
|
# [*debug*]
|
||||||
# (Optional) Should the daemons log debug messages
|
# (Optional) Should the daemons log debug messages
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
@ -89,12 +85,6 @@
|
|||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
# Example: 'Y-%m-%d %H:%M:%S'
|
# Example: 'Y-%m-%d %H:%M:%S'
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*verbose*]
|
|
||||||
# (Optional) Deprecated. Should the daemons log verbose messages
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class ironic::logging(
|
class ironic::logging(
|
||||||
$use_syslog = $::os_service_default,
|
$use_syslog = $::os_service_default,
|
||||||
$use_stderr = $::os_service_default,
|
$use_stderr = $::os_service_default,
|
||||||
@ -112,8 +102,6 @@ class ironic::logging(
|
|||||||
$instance_format = $::os_service_default,
|
$instance_format = $::os_service_default,
|
||||||
$instance_uuid_format = $::os_service_default,
|
$instance_uuid_format = $::os_service_default,
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
# Deprecated
|
|
||||||
$verbose = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::ironic::deps
|
include ::ironic::deps
|
||||||
@ -126,10 +114,6 @@ class ironic::logging(
|
|||||||
$log_dir_real = pick($::ironic::log_dir,$log_dir)
|
$log_dir_real = pick($::ironic::log_dir,$log_dir)
|
||||||
$debug_real = pick($::ironic::debug,$debug)
|
$debug_real = pick($::ironic::debug,$debug)
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
|
|
||||||
oslo::log { 'ironic_config':
|
oslo::log { 'ironic_config':
|
||||||
debug => $debug_real,
|
debug => $debug_real,
|
||||||
use_stderr => $use_stderr_real,
|
use_stderr => $use_stderr_real,
|
||||||
|
5
releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml
Normal file
5
releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
other:
|
||||||
|
- This patch removes the verbose parameter. Since we are in Ocata
|
||||||
|
and this option was marked to be removed in this release.
|
||||||
|
In Newton the option was deprecated.
|
Loading…
Reference in New Issue
Block a user