Skip to content

Commit 0fce9ab

Browse files
vStonevStone
committed
Reorder and realign all parameters
Attempt to group parameters that belong together. Add data types to a couple of parameters (Booleans)
1 parent b534e1a commit 0fce9ab

File tree

1 file changed

+61
-52
lines changed

1 file changed

+61
-52
lines changed

‎manifests/init.pp‎

Lines changed: 61 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -305,68 +305,77 @@
305305
# Copyright (C) 2012 Mike Arnold, unless otherwise noted.
306306
#
307307
class snmp (
308-
Enum['present','absent'] $ensure = $snmp::params::ensure,
309-
$agentaddress = $snmp::params::agentaddress,
310-
Array[String[1]] $snmptrapdaddr = $snmp::params::snmptrapdaddr,
311-
$ro_community = $snmp::params::ro_community,
312-
$ro_community6 = $snmp::params::ro_community6,
313-
$rw_community = $snmp::params::rw_community,
314-
$rw_community6 = $snmp::params::rw_community6,
315-
$ro_network = $snmp::params::ro_network,
316-
$ro_network6 = $snmp::params::ro_network6,
317-
$rw_network = $snmp::params::rw_network,
318-
$rw_network6 = $snmp::params::rw_network6,
319-
$contact = $snmp::params::contact,
320-
$location = $snmp::params::location,
321-
$sysname = $snmp::params::sysname,
322-
$services = $snmp::params::services,
323-
Array[String[1]] $com2sec = $snmp::params::com2sec,
324-
Array[String[1]] $com2sec6 = $snmp::params::com2sec6,
325-
Array[String[1]] $groups = $snmp::params::groups,
326-
Array[String[1]] $views = $snmp::params::views,
327-
Array[String[1]] $accesses = $snmp::params::accesses,
328-
Array[String[1]] $dlmod = $snmp::params::dlmod,
329-
Array[String[1]] $extends = $snmp::params::extends,
330-
Array[String] $snmpd_config = $snmp::params::snmpd_config,
308+
# Usage
309+
Enum['present','absent'] $ensure = $snmp::params::ensure,
310+
Boolean $autoupgrade = $snmp::params::autoupgrade,
311+
Boolean $manage_client = $snmp::params::manage_client,
312+
Optional[String] $snmpd_options = $snmp::params::snmpd_options,
313+
Optional[String] $snmptrapd_options = $snmp::params::snmptrapd_options,
314+
315+
# Configuration
316+
$agentaddress = $snmp::params::agentaddress,
317+
Array[String[1]] $snmptrapdaddr = $snmp::params::snmptrapdaddr,
318+
$ro_community = $snmp::params::ro_community,
319+
$ro_community6 = $snmp::params::ro_community6,
320+
$rw_community = $snmp::params::rw_community,
321+
$rw_community6 = $snmp::params::rw_community6,
322+
$ro_network = $snmp::params::ro_network,
323+
$ro_network6 = $snmp::params::ro_network6,
324+
$rw_network = $snmp::params::rw_network,
325+
$rw_network6 = $snmp::params::rw_network6,
326+
$contact = $snmp::params::contact,
327+
$location = $snmp::params::location,
328+
$sysname = $snmp::params::sysname,
329+
$services = $snmp::params::services,
330+
Array[String[1]] $com2sec = $snmp::params::com2sec,
331+
Array[String[1]] $com2sec6 = $snmp::params::com2sec6,
332+
Array[String[1]] $groups = $snmp::params::groups,
333+
Array[String[1]] $views = $snmp::params::views,
334+
Array[String[1]] $accesses = $snmp::params::accesses,
335+
Array[String[1]] $dlmod = $snmp::params::dlmod,
336+
Array[String[1]] $extends = $snmp::params::extends,
337+
Boolean $openmanage_enable = $snmp::params::openmanage_enable,
338+
Boolean $master = $snmp::params::master,
339+
$agentx_perms = $snmp::params::agentx_perms,
340+
$agentx_ping_interval = $snmp::params::agentx_ping_interval,
341+
$agentx_socket = $snmp::params::agentx_socket,
342+
Integer[0] $agentx_timeout = $snmp::params::agentx_timeout,
343+
Integer[0] $agentx_retries = $snmp::params::agentx_retries,
344+
Boolean $snmpv2_enable = $snmp::params::snmpv2_enable,
331345
Enum['yes','no'] $disable_authorization = $snmp::params::disable_authorization,
332346
Enum['yes','no'] $do_not_log_traps = $snmp::params::do_not_log_traps,
333347
Enum['yes','no'] $do_not_log_tcpwrappers = $snmp::params::do_not_log_tcpwrappers,
334-
Array[String[1]] $trap_handlers = $snmp::params::trap_handlers,
335-
Array[String[1]] $trap_forwards = $snmp::params::trap_forwards,
336-
Array[String] $snmptrapd_config = $snmp::params::snmptrapd_config,
337-
Boolean $manage_client = $snmp::params::manage_client,
338-
$snmp_config = $snmp::params::snmp_config,
339-
Boolean $autoupgrade = $snmp::params::autoupgrade,
340-
String[1] $package_name = $snmp::params::package_name,
341-
Optional[String] $snmptrapd_package_name = $snmp::params::snmptrapd_package_name,
342-
$snmpd_options = $snmp::params::snmpd_options,
343-
Stdlib::Filemode $service_config_perms = $snmp::params::service_config_perms,
344-
String[1] $service_config_dir_group = $snmp::params::service_config_dir_group,
345-
Stdlib::Ensure::Service $service_ensure = $snmp::params::service_ensure,
346-
String[1] $service_name = $snmp::params::service_name,
347-
Boolean $service_enable = $snmp::params::service_enable,
348-
Boolean $service_hasstatus = $snmp::params::service_hasstatus,
349-
Boolean $service_hasrestart = $snmp::params::service_hasrestart,
350-
Optional[String] $snmptrapd_options = $snmp::params::snmptrapd_options,
348+
Array[String[1]] $trap_handlers = $snmp::params::trap_handlers,
349+
Array[String[1]] $trap_forwards = $snmp::params::trap_forwards,
350+
# manual config overrides. Added to templates as is.
351+
Array[String] $snmp_config = $snmp::params::snmp_config,
352+
Array[String] $snmpd_config = $snmp::params::snmpd_config,
353+
Array[String] $snmptrapd_config = $snmp::params::snmptrapd_config,
354+
355+
# (Advanced) System configuration
356+
Stdlib::Filemode $service_config_perms = $snmp::params::service_config_perms,
357+
String[1] $service_config_dir_group = $snmp::params::service_config_dir_group,
358+
# snmpd
359+
String[1] $package_name = $snmp::params::package_name,
360+
Stdlib::Ensure::Service $service_ensure = $snmp::params::service_ensure,
361+
String[1] $service_name = $snmp::params::service_name,
362+
Boolean $service_enable = $snmp::params::service_enable,
363+
Boolean $service_hasstatus = $snmp::params::service_hasstatus,
364+
Boolean $service_hasrestart = $snmp::params::service_hasrestart,
365+
# snmptrapd
366+
Optional[String[1]] $snmptrapd_package_name = $snmp::params::snmptrapd_package_name,
351367
Stdlib::Ensure::Service $trap_service_ensure = $snmp::params::trap_service_ensure,
352-
$trap_service_name = $snmp::params::trap_service_name,
353-
$trap_service_enable = $snmp::params::trap_service_enable,
354-
$trap_service_hasstatus = $snmp::params::trap_service_hasstatus,
355-
$trap_service_hasrestart = $snmp::params::trap_service_hasrestart,
368+
String[1] $trap_service_name = $snmp::params::trap_service_name,
369+
Boolean $trap_service_enable = $snmp::params::trap_service_enable,
370+
Boolean $trap_service_hasstatus = $snmp::params::trap_service_hasstatus,
371+
Boolean $trap_service_hasrestart = $snmp::params::trap_service_hasrestart,
372+
# (Super Advanced) template overrides
356373
String[1] $template_snmpd_conf = $snmp::params::template_snmpd_conf,
357374
String[1] $template_snmpd_sysconfig = $snmp::params::template_snmpd_sysconfig,
358375
String[1] $template_snmpd_systemd_dropin = $snmp::params::template_snmpd_systemd_dropin,
359376
String[1] $template_snmptrapd = $snmp::params::template_snmptrapd,
360377
String[1] $template_snmptrapd_sysconfig = $snmp::params::template_snmptrapd_sysconfig,
361378
String[1] $template_snmptrapd_systemd_dropin = $snmp::params::template_snmptrapd_systemd_dropin,
362-
Boolean $openmanage_enable = $snmp::params::openmanage_enable,
363-
Boolean $master = $snmp::params::master,
364-
$agentx_perms = $snmp::params::agentx_perms,
365-
$agentx_ping_interval = $snmp::params::agentx_ping_interval,
366-
$agentx_socket = $snmp::params::agentx_socket,
367-
Integer[0] $agentx_timeout = $snmp::params::agentx_timeout,
368-
Integer[0] $agentx_retries = $snmp::params::agentx_retries,
369-
Boolean $snmpv2_enable = $snmp::params::snmpv2_enable,
370379
) inherits snmp::params {
371380

372381
if $ensure == 'present' {

0 commit comments

Comments
 (0)