openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Remove verbose"

This commit is contained in:
Jenkins 2016-10-24 18:40:39 +00:00 committed by Gerrit Code Review
parent d3630bda97 f374a0bf6e
commit d91618f9e8
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@ -356,10 +356,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*verbose*]
# (optional) Deprecated. Verbose logging
# Defaults to undef
#
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults to undef # Defaults to undef
@ -458,7 +454,6 @@ class neutron (
$notification_topics = $::os_service_default, $notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default, $notification_transport_url = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$verbose = undef,
$log_facility = undef, $log_facility = undef,
$advertise_mtu = undef, $advertise_mtu = undef,
$allow_pagination = undef, $allow_pagination = undef,
@ -472,10 +467,6 @@ class neutron (
include ::neutron::logging include ::neutron::logging
} }
if $verbose {
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
}
if ! is_service_default($use_ssl) and ($use_ssl) { if ! is_service_default($use_ssl) and ($use_ssl) {
if is_service_default($cert_file) { if is_service_default($cert_file) {
fail('The cert_file parameter is required when use_ssl is set to true') fail('The cert_file parameter is required when use_ssl is set to true')

9
manifests/logging.pp
View File

@ -99,10 +99,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*verbose*]
# (optional) Deprecated. Verbose logging
# Defaults to undef
#
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults to undef # Defaults to undef
@ -128,7 +124,6 @@ class neutron::logging (
$instance_uuid_format = $::os_service_default, $instance_uuid_format = $::os_service_default,
$fatal_deprecations = $::os_service_default, $fatal_deprecations = $::os_service_default,
# Deprecated # Deprecated
$verbose = undef,
$log_facility = undef, $log_facility = undef,
) { ) {
@ -140,10 +135,6 @@ class neutron::logging (
$log_file_real = pick($::neutron::log_file,$log_file) $log_file_real = pick($::neutron::log_file,$log_file)
$log_dir_real = pick($::neutron::log_dir,$log_dir) $log_dir_real = pick($::neutron::log_dir,$log_dir)
if $verbose {
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
}
if $log_facility { if $log_facility {
warning('log_facility is deprecated, has no effect and will be removed after Newton cycle. Please use syslog_log_facility instead.') warning('log_facility is deprecated, has no effect and will be removed after Newton cycle. Please use syslog_log_facility instead.')
} }

4
releasenotes/notes/remove_verbose-a2969f741999c0e5.yaml Normal file
View File

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