Merge "Deprecate unused ::ceph::rgw::syslog parameter"
This commit is contained in:
commit
543e575047
|
@ -64,9 +64,12 @@
|
|||
# [*rgw_frontends*] Arguments to the rgw frontend
|
||||
# Optional. Default is 'fastcgi socket_port=9000 socket_host=127.0.0.1'. Example: "civetweb port=7480"
|
||||
#
|
||||
# Deprecated Parameters:
|
||||
#
|
||||
# [*syslog*] Whether or not to log to syslog.
|
||||
# Optional. Default is true.
|
||||
#
|
||||
|
||||
define ceph::rgw (
|
||||
$pkg_radosgw = $::ceph::params::pkg_radosgw,
|
||||
$rgw_ensure = 'running',
|
||||
|
@ -81,11 +84,16 @@ define ceph::rgw (
|
|||
$rgw_port = undef,
|
||||
$frontend_type = 'apache-fastcgi',
|
||||
$rgw_frontends = 'fastcgi socket_port=9000 socket_host=127.0.0.1',
|
||||
$syslog = true,
|
||||
$syslog = undef,
|
||||
) {
|
||||
|
||||
include ::stdlib
|
||||
|
||||
if $syslog
|
||||
{
|
||||
warning( 'The syslog parameter is unused and deprecated. It will be removed in a future release.' )
|
||||
}
|
||||
|
||||
unless $name =~ /^radosgw\..+/ {
|
||||
fail("Define name must be started with 'radosgw.'")
|
||||
}
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
the ceph::rgw::syslog paramter is unused and will be removed
|
|
@ -91,7 +91,6 @@ describe 'ceph::rgw' do
|
|||
:rgw_socket_path => '/some/location/radosgw.sock',
|
||||
:rgw_print_continue => true,
|
||||
:rgw_port => 1111,
|
||||
:syslog => false,
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -187,7 +186,6 @@ describe 'ceph::rgw' do
|
|||
:rgw_socket_path => '/some/location/radosgw.sock',
|
||||
:rgw_print_continue => true,
|
||||
:rgw_port => 1111,
|
||||
:syslog => false,
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -283,7 +281,6 @@ describe 'ceph::rgw' do
|
|||
:rgw_socket_path => '/some/location/radosgw.sock',
|
||||
:rgw_print_continue => true,
|
||||
:rgw_port => 1111,
|
||||
:syslog => false,
|
||||
}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue