openstack/puppet-ceph
Code Issues Proposed changes

Ensure appropriate value type for exec timeout

Browse Source 
The exec timeout should be a float value. This adds parameter types
so that only the expected value type is accepted.

Change-Id: I2ae7439599b056b56f3bb634cabcc2813700691a
This commit is contained in:
Takashi Kajinami
2024-01-03 12:55:36 +09:00
parent 2bbb88eeee
commit c23e50763a
5 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/fs.pp
View File

@@ -39,7 +39,7 @@
define ceph::fs ( define ceph::fs (
$metadata_pool, $metadata_pool,
$data_pool, $data_pool,
$exec_timeout = undef, Optional[Float[0]] $exec_timeout = undef,
) { ) {
include ceph::params include ceph::params

6
manifests/mon.pp
View File

@@ -65,8 +65,8 @@ define ceph::mon (
Enum['cephx', 'none'] $authentication_type = 'cephx', Enum['cephx', 'none'] $authentication_type = 'cephx',
$key = undef, $key = undef,
$keyring = undef, $keyring = undef,
$exec_timeout = undef Optional[Float[0]] $exec_timeout = undef,
) { ) {
include ceph::params include ceph::params
$exec_timeout_real = $exec_timeout ? { $exec_timeout_real = $exec_timeout ? {
undef => $ceph::params::exec_timeout, undef => $ceph::params::exec_timeout,
@@ -234,4 +234,4 @@ test ! -d \$mon_data
"mon.${id}/public_addr": ensure => absent; "mon.${id}/public_addr": ensure => absent;
} -> Package<| tag == 'ceph' |> } -> Package<| tag == 'ceph' |>
} }
} }

2
manifests/osd.pp
View File

@@ -73,7 +73,7 @@ define ceph::osd (
$bluestore_wal = undef, $bluestore_wal = undef,
$bluestore_db = undef, $bluestore_db = undef,
Optional[Enum['filestore', 'bluestore']] $store_type = undef, Optional[Enum['filestore', 'bluestore']] $store_type = undef,
$exec_timeout = undef, Optional[Float[0]] $exec_timeout = undef,
$selinux_file_context = 'ceph_var_lib_t', $selinux_file_context = 'ceph_var_lib_t',
$fsid = undef, $fsid = undef,
Boolean $dmcrypt = false, Boolean $dmcrypt = false,

2
manifests/params.pp
View File

@@ -41,7 +41,7 @@
# #
class ceph::params ( class ceph::params (
$exec_timeout = 600, Optional[Float[0]] $exec_timeout = undef,
$packages = ['ceph'], # just provide the minimum per default $packages = ['ceph'], # just provide the minimum per default
$rgw_socket_path = '/tmp/radosgw.sock', $rgw_socket_path = '/tmp/radosgw.sock',
$enable_sig = false, $enable_sig = false,

2
manifests/pool.pp
View File

@@ -56,7 +56,7 @@ define ceph::pool (
$pgp_num = undef, $pgp_num = undef,
$size = undef, $size = undef,
$tag = undef, $tag = undef,
$exec_timeout = undef, Optional[Float[0]] $exec_timeout = undef,
) { ) {
include ceph::params include ceph::params