Remove verbose
Since we are in Ocata we should remove the verbose option that was deprecated Change-Id: I83524dbfa5930e4af5ee3b560f1a123712e641a0
This commit is contained in:
parent
5c399ed780
commit
eb8acb884a
@ -575,10 +575,6 @@
|
|||||||
# [*service_provider*]
|
# [*service_provider*]
|
||||||
# (optional) Deprecated. Provider, that can be used for keystone service.
|
# (optional) Deprecated. Provider, that can be used for keystone service.
|
||||||
#
|
#
|
||||||
# [*verbose*]
|
|
||||||
# (optional) Deprecated. Rather keystone should log at verbose level.
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
# [*enable_pki_setup*]
|
# [*enable_pki_setup*]
|
||||||
# (optional) Deprecated. Enable call to pki_setup to generate the cert for signing pki tokens and
|
# (optional) Deprecated. Enable call to pki_setup to generate the cert for signing pki tokens and
|
||||||
# revocation lists if it doesn't already exist. This generates a cert and key stored in file
|
# revocation lists if it doesn't already exist. This generates a cert and key stored in file
|
||||||
@ -752,7 +748,6 @@ class keystone(
|
|||||||
$admin_workers = $::os_workers,
|
$admin_workers = $::os_workers,
|
||||||
$public_workers = $::os_workers,
|
$public_workers = $::os_workers,
|
||||||
$service_provider = undef,
|
$service_provider = undef,
|
||||||
$verbose = undef,
|
|
||||||
$enable_pki_setup = undef,
|
$enable_pki_setup = undef,
|
||||||
$signing_certfile = $::os_service_default,
|
$signing_certfile = $::os_service_default,
|
||||||
$signing_keyfile = $::os_service_default,
|
$signing_keyfile = $::os_service_default,
|
||||||
@ -774,10 +769,6 @@ class keystone(
|
|||||||
use a Puppet resource collector if you want to modify the service provider.")
|
use a Puppet resource collector if you want to modify the service provider.")
|
||||||
}
|
}
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! $catalog_driver {
|
if ! $catalog_driver {
|
||||||
validate_re($catalog_type, 'template|sql')
|
validate_re($catalog_type, 'template|sql')
|
||||||
}
|
}
|
||||||
|
@ -102,13 +102,6 @@
|
|||||||
# (Optional) Uses logging handler designed to watch file system (boolean value).
|
# (Optional) Uses logging handler designed to watch file system (boolean value).
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
# DEPRECATED
|
|
||||||
#
|
|
||||||
# [*verbose*]
|
|
||||||
# (Optional) Deprecated. Should the daemons log verbose messages
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
|
|
||||||
class keystone::logging(
|
class keystone::logging(
|
||||||
$use_syslog = $::os_service_default,
|
$use_syslog = $::os_service_default,
|
||||||
$use_stderr = $::os_service_default,
|
$use_stderr = $::os_service_default,
|
||||||
@ -129,16 +122,10 @@ class keystone::logging(
|
|||||||
$instance_uuid_format = $::os_service_default,
|
$instance_uuid_format = $::os_service_default,
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
$watch_log_file = $::os_service_default,
|
$watch_log_file = $::os_service_default,
|
||||||
# DEPRECATED
|
|
||||||
$verbose = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::keystone::deps
|
include ::keystone::deps
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
|
|
||||||
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
||||||
# to use keystone::<myparam> first then keystone::logging::<myparam>.
|
# to use keystone::<myparam> first then keystone::logging::<myparam>.
|
||||||
$use_syslog_real = pick($::keystone::use_syslog,$use_syslog)
|
$use_syslog_real = pick($::keystone::use_syslog,$use_syslog)
|
||||||
|
4
releasenotes/notes/remove_verbose-6cbdd66294362090.yaml
Normal file
4
releasenotes/notes/remove_verbose-6cbdd66294362090.yaml
Normal file
@ -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
Block a user