Skip to content

Commit 15a028f

Browse files
bastelfreakbastelfreak
authoredNov 1, 2017
Merge pull request #706 from bastelfreak/datatypes
replace validate_* with datatypes
·
v14.0.0v7.0.0
2 parents 8741d90 + eda89c0 commit 15a028f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+429
-1128
lines changed
 

‎manifests/config.pp

+20-33
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,27 @@
11
# private
22
class collectd::config (
3-
$collectd_hostname = $collectd::collectd_hostname,
4-
$config_file = $collectd::config_file,
5-
$conf_content = $collectd::conf_content,
6-
$fqdnlookup = $collectd::fqdnlookup,
7-
$has_wordexp = $collectd::has_wordexp,
8-
$include = $collectd::include,
9-
$internal_stats = $collectd::internal_stats,
10-
$interval = $collectd::interval,
11-
$plugin_conf_dir = $collectd::plugin_conf_dir,
12-
$plugin_conf_dir_mode = $collectd::plugin_conf_dir_mode,
13-
$recurse = $collectd::recurse,
14-
$root_group = $collectd::root_group,
15-
$purge = $collectd::purge,
16-
$purge_config = $collectd::purge_config,
17-
$read_threads = $collectd::read_threads,
18-
$timeout = $collectd::timeout,
19-
$typesdb = $collectd::typesdb,
20-
$write_queue_limit_high = $collectd::write_queue_limit_high,
21-
$write_queue_limit_low = $collectd::write_queue_limit_low,
22-
$write_threads = $collectd::write_threads,
3+
$collectd_hostname = $collectd::collectd_hostname,
4+
Stdlib::Absolutepath $config_file = $collectd::config_file,
5+
$conf_content = $collectd::conf_content,
6+
Boolean $fqdnlookup = $collectd::fqdnlookup,
7+
Boolean $has_wordexp = $collectd::has_wordexp,
8+
Array $include = $collectd::include,
9+
Boolean $internal_stats = $collectd::internal_stats,
10+
Integer $interval = $collectd::interval,
11+
Stdlib::Absolutepath $plugin_conf_dir = $collectd::plugin_conf_dir,
12+
$plugin_conf_dir_mode = $collectd::plugin_conf_dir_mode,
13+
$recurse = $collectd::recurse,
14+
$root_group = $collectd::root_group,
15+
$purge = $collectd::purge,
16+
Boolean $purge_config = $collectd::purge_config,
17+
Integer $read_threads = $collectd::read_threads,
18+
Integer $timeout = $collectd::timeout,
19+
Array $typesdb = $collectd::typesdb,
20+
$write_queue_limit_high = $collectd::write_queue_limit_high,
21+
$write_queue_limit_low = $collectd::write_queue_limit_low,
22+
Integer $write_threads = $collectd::write_threads,
2323
) {
2424

25-
validate_absolute_path($config_file)
26-
validate_bool($fqdnlookup)
27-
validate_bool($has_wordexp)
28-
validate_array($include)
29-
validate_bool($internal_stats)
30-
validate_integer($interval)
31-
validate_absolute_path($plugin_conf_dir)
32-
validate_bool($purge_config)
33-
validate_integer($read_threads)
34-
validate_integer($timeout)
35-
validate_array($typesdb)
36-
validate_integer($write_threads)
37-
3825
$_conf_content = $purge_config ? {
3926
true => template('collectd/collectd.conf.erb'),
4027
default => $conf_content,

‎manifests/init.pp

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
#
22
class collectd (
3-
$collectd_hostname = $collectd::params::collectd_hostname,
4-
$conf_content = $collectd::params::conf_content,
5-
$config_file = $collectd::params::config_file,
6-
$fqdnlookup = $collectd::params::fqdnlookup,
7-
$has_wordexp = $collectd::params::has_wordexp,
8-
$include = $collectd::params::include,
9-
$interval = $collectd::params::interval,
10-
$internal_stats = $collectd::params::internal_stats,
11-
$manage_package = $collectd::params::manage_package,
12-
$manage_repo = $collectd::params::manage_repo,
13-
$ci_package_repo = $collectd::params::ci_package_repo,
14-
$manage_service = $collectd::params::manage_service,
15-
$minimum_version = $collectd::params::minimum_version,
16-
$package_ensure = $collectd::params::package_ensure,
17-
$package_install_options = $collectd::params::package_install_options,
18-
$package_name = $collectd::params::package_name,
19-
$package_provider = $collectd::params::package_provider,
20-
$plugin_conf_dir = $collectd::params::plugin_conf_dir,
21-
$plugin_conf_dir_mode = $collectd::params::plugin_conf_dir_mode,
22-
$purge = $collectd::params::purge,
23-
$purge_config = $collectd::params::purge_config,
24-
$read_threads = $collectd::params::read_threads,
25-
$recurse = $collectd::params::recurse,
26-
$root_group = $collectd::params::root_group,
27-
$service_enable = $collectd::params::service_enable,
28-
$service_ensure = $collectd::params::service_ensure,
29-
$service_name = $collectd::params::service_name,
30-
$timeout = $collectd::params::timeout,
31-
$typesdb = $collectd::params::typesdb,
32-
$write_queue_limit_high = $collectd::params::write_queue_limit_high,
33-
$write_queue_limit_low = $collectd::params::write_queue_limit_low,
34-
$write_threads = $collectd::params::write_threads,
3+
$collectd_hostname = $collectd::params::collectd_hostname,
4+
$conf_content = $collectd::params::conf_content,
5+
$config_file = $collectd::params::config_file,
6+
$fqdnlookup = $collectd::params::fqdnlookup,
7+
$has_wordexp = $collectd::params::has_wordexp,
8+
$include = $collectd::params::include,
9+
$interval = $collectd::params::interval,
10+
$internal_stats = $collectd::params::internal_stats,
11+
$manage_package = $collectd::params::manage_package,
12+
$manage_repo = $collectd::params::manage_repo,
13+
Optional[Pattern[/(^5.4|^5.5|^5.6|^5.7|^master)/]] $ci_package_repo = $collectd::params::ci_package_repo,
14+
$manage_service = $collectd::params::manage_service,
15+
$minimum_version = $collectd::params::minimum_version,
16+
$package_ensure = $collectd::params::package_ensure,
17+
$package_install_options = $collectd::params::package_install_options,
18+
$package_name = $collectd::params::package_name,
19+
$package_provider = $collectd::params::package_provider,
20+
$plugin_conf_dir = $collectd::params::plugin_conf_dir,
21+
$plugin_conf_dir_mode = $collectd::params::plugin_conf_dir_mode,
22+
$purge = $collectd::params::purge,
23+
$purge_config = $collectd::params::purge_config,
24+
$read_threads = $collectd::params::read_threads,
25+
$recurse = $collectd::params::recurse,
26+
$root_group = $collectd::params::root_group,
27+
$service_enable = $collectd::params::service_enable,
28+
$service_ensure = $collectd::params::service_ensure,
29+
$service_name = $collectd::params::service_name,
30+
$timeout = $collectd::params::timeout,
31+
$typesdb = $collectd::params::typesdb,
32+
$write_queue_limit_high = $collectd::params::write_queue_limit_high,
33+
$write_queue_limit_low = $collectd::params::write_queue_limit_low,
34+
$write_threads = $collectd::params::write_threads,
3535
) inherits collectd::params {
3636

3737
$collectd_version_real = pick($::collectd_version, $minimum_version)

0 commit comments

Comments
 (0)
Please sign in to comment.