Merge "Ensure appropriate value type for exec timeout"
This commit is contained in:
commit
c9e7edcbed
|
@ -39,7 +39,7 @@
|
|||
define ceph::fs (
|
||||
$metadata_pool,
|
||||
$data_pool,
|
||||
$exec_timeout = undef,
|
||||
Optional[Float[0]] $exec_timeout = undef,
|
||||
) {
|
||||
|
||||
include ceph::params
|
||||
|
|
|
@ -65,7 +65,7 @@ define ceph::mon (
|
|||
Enum['cephx', 'none'] $authentication_type = 'cephx',
|
||||
$key = undef,
|
||||
$keyring = undef,
|
||||
$exec_timeout = undef
|
||||
Optional[Float[0]] $exec_timeout = undef,
|
||||
) {
|
||||
include ceph::params
|
||||
$exec_timeout_real = $exec_timeout ? {
|
||||
|
|
|
@ -73,7 +73,7 @@ define ceph::osd (
|
|||
$bluestore_wal = undef,
|
||||
$bluestore_db = undef,
|
||||
Optional[Enum['filestore', 'bluestore']] $store_type = undef,
|
||||
$exec_timeout = undef,
|
||||
Optional[Float[0]] $exec_timeout = undef,
|
||||
$selinux_file_context = 'ceph_var_lib_t',
|
||||
$fsid = undef,
|
||||
Boolean $dmcrypt = false,
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#
|
||||
|
||||
class ceph::params (
|
||||
$exec_timeout = 600,
|
||||
Optional[Float[0]] $exec_timeout = undef,
|
||||
$packages = ['ceph'], # just provide the minimum per default
|
||||
$rgw_socket_path = '/tmp/radosgw.sock',
|
||||
$enable_sig = false,
|
||||
|
|
|
@ -56,7 +56,7 @@ define ceph::pool (
|
|||
$pgp_num = undef,
|
||||
$size = undef,
|
||||
$tag = undef,
|
||||
$exec_timeout = undef,
|
||||
Optional[Float[0]] $exec_timeout = undef,
|
||||
) {
|
||||
|
||||
include ceph::params
|
||||
|
|
Loading…
Reference in New Issue