Merge branch 'aschaber1-feature/template_param' into develop

voxpupuli · Apr 22, 2017 · 68a4cda · 68a4cda
2 parents 193dc7f + a5a9bdd
commit 68a4cda
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 51 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -255,53 +255,57 @@
 # Copyright (C) 2012 Mike Arnold, unless otherwise noted.
 #
 class snmp (
-  $agentaddress            = $snmp::params::agentaddress,
-  $snmptrapdaddr           = $snmp::params::snmptrapdaddr,
-  $ro_community            = $snmp::params::ro_community,
-  $ro_community6           = $snmp::params::ro_community6,
-  $rw_community            = $snmp::params::rw_community,
-  $rw_community6           = $snmp::params::rw_community6,
-  $ro_network              = $snmp::params::ro_network,
-  $ro_network6             = $snmp::params::ro_network6,
-  $rw_network              = $snmp::params::rw_network,
-  $rw_network6             = $snmp::params::rw_network6,
-  $contact                 = $snmp::params::contact,
-  $location                = $snmp::params::location,
-  $sysname                 = $snmp::params::sysname,
-  $services                = $snmp::params::services,
-  $com2sec                 = $snmp::params::com2sec,
-  $com2sec6                = $snmp::params::com2sec6,
-  $groups                  = $snmp::params::groups,
-  $views                   = $snmp::params::views,
-  $accesses                = $snmp::params::accesses,
-  $dlmod                   = $snmp::params::dlmod,
-  $snmpd_config            = $snmp::params::snmpd_config,
-  $disable_authorization   = $snmp::params::disable_authorization,
-  $do_not_log_traps        = $snmp::params::do_not_log_traps,
-  $do_not_log_tcpwrappers  = $snmp::params::do_not_log_tcpwrappers,
-  $trap_handlers           = $snmp::params::trap_handlers,
-  $trap_forwards           = $snmp::params::trap_forwards,
-  $snmptrapd_config        = $snmp::params::snmptrapd_config,
-  $install_client          = $snmp::params::install_client,
-  $manage_client           = $snmp::params::safe_manage_client,
-  $snmp_config             = $snmp::params::snmp_config,
-  $ensure                  = $snmp::params::ensure,
-  $autoupgrade             = $snmp::params::safe_autoupgrade,
-  $package_name            = $snmp::params::package_name,
-  $snmpd_options           = $snmp::params::snmpd_options,
-  $service_config_perms    = $snmp::params::service_config_perms,
-  $service_ensure          = $snmp::params::service_ensure,
-  $service_name            = $snmp::params::service_name,
-  $service_enable          = $snmp::params::service_enable,
-  $service_hasstatus       = $snmp::params::service_hasstatus,
-  $service_hasrestart      = $snmp::params::service_hasrestart,
-  $snmptrapd_options       = $snmp::params::snmptrapd_options,
-  $trap_service_ensure     = $snmp::params::trap_service_ensure,
-  $trap_service_name       = $snmp::params::trap_service_name,
-  $trap_service_enable     = $snmp::params::trap_service_enable,
-  $trap_service_hasstatus  = $snmp::params::trap_service_hasstatus,
-  $trap_service_hasrestart = $snmp::params::trap_service_hasrestart,
-  $openmanage_enable       = $snmp::params::openmanage_enable,
+  $agentaddress                 = $snmp::params::agentaddress,
+  $snmptrapdaddr                = $snmp::params::snmptrapdaddr,
+  $ro_community                 = $snmp::params::ro_community,
+  $ro_community6                = $snmp::params::ro_community6,
+  $rw_community                 = $snmp::params::rw_community,
+  $rw_community6                = $snmp::params::rw_community6,
+  $ro_network                   = $snmp::params::ro_network,
+  $ro_network6                  = $snmp::params::ro_network6,
+  $rw_network                   = $snmp::params::rw_network,
+  $rw_network6                  = $snmp::params::rw_network6,
+  $contact                      = $snmp::params::contact,
+  $location                     = $snmp::params::location,
+  $sysname                      = $snmp::params::sysname,
+  $services                     = $snmp::params::services,
+  $com2sec                      = $snmp::params::com2sec,
+  $com2sec6                     = $snmp::params::com2sec6,
+  $groups                       = $snmp::params::groups,
+  $views                        = $snmp::params::views,
+  $accesses                     = $snmp::params::accesses,
+  $dlmod                        = $snmp::params::dlmod,
+  $snmpd_config                 = $snmp::params::snmpd_config,
+  $disable_authorization        = $snmp::params::disable_authorization,
+  $do_not_log_traps             = $snmp::params::do_not_log_traps,
+  $do_not_log_tcpwrappers       = $snmp::params::do_not_log_tcpwrappers,
+  $trap_handlers                = $snmp::params::trap_handlers,
+  $trap_forwards                = $snmp::params::trap_forwards,
+  $snmptrapd_config             = $snmp::params::snmptrapd_config,
+  $install_client               = $snmp::params::install_client,
+  $manage_client                = $snmp::params::safe_manage_client,
+  $snmp_config                  = $snmp::params::snmp_config,
+  $ensure                       = $snmp::params::ensure,
+  $autoupgrade                  = $snmp::params::safe_autoupgrade,
+  $package_name                 = $snmp::params::package_name,
+  $snmpd_options                = $snmp::params::snmpd_options,
+  $service_config_perms         = $snmp::params::service_config_perms,
+  $service_ensure               = $snmp::params::service_ensure,
+  $service_name                 = $snmp::params::service_name,
+  $service_enable               = $snmp::params::service_enable,
+  $service_hasstatus            = $snmp::params::service_hasstatus,
+  $service_hasrestart           = $snmp::params::service_hasrestart,
+  $snmptrapd_options            = $snmp::params::snmptrapd_options,
+  $trap_service_ensure          = $snmp::params::trap_service_ensure,
+  $trap_service_name            = $snmp::params::trap_service_name,
+  $trap_service_enable          = $snmp::params::trap_service_enable,
+  $trap_service_hasstatus       = $snmp::params::trap_service_hasstatus,
+  $trap_service_hasrestart      = $snmp::params::trap_service_hasrestart,
+  $template_snmpd_conf          = $snmp::params::template_snmpd_conf,
+  $template_snmpd_sysconfig     = $snmp::params::template_snmpd_sysconfig,
+  $template_snmptrapd           = $snmp::params::template_snmptrapd,
+  $template_snmptrapd_sysconfig = $snmp::params::template_snmptrapd_sysconfig,
+  $openmanage_enable            = $snmp::params::openmanage_enable,
 ) inherits snmp::params {
   # Validate our booleans
   validate_bool($manage_client)
@@ -325,6 +329,12 @@
   validate_array($snmpd_config)
   validate_array($snmptrapd_config)
 
+  # Validate our strings
+  validate_string($template_snmpd_conf)
+  validate_string($template_snmpd_sysconfig)
+  validate_string($template_snmptrapd)
+  validate_string($template_snmptrapd_sysconfig)
+
   # Validate our regular expressions
   $states = [ '^yes$', '^no$' ]
   validate_re($disable_authorization, $states, '$disable_authorization must be either yes or no.')
@@ -436,7 +446,7 @@
     owner   => 'root',
     group   => $snmp::params::service_config_dir_group,
     path    => $snmp::params::service_config,
-    content => template('snmp/snmpd.conf.erb'),
+    content => template($template_snmpd_conf),
     require => Package['snmpd'],
     notify  => Service['snmpd'],
   }
@@ -448,7 +458,7 @@
       owner   => 'root',
       group   => 'root',
       path    => $snmp::params::sysconfig,
-      content => template("snmp/snmpd.sysconfig-${::osfamily}.erb"),
+      content => template($template_snmpd_sysconfig),
       require => Package['snmpd'],
       notify  => Service['snmpd'],
     }
@@ -460,7 +470,7 @@
     owner   => 'root',
     group   => $snmp::params::service_config_dir_group,
     path    => $snmp::params::trap_service_config,
-    content => template('snmp/snmptrapd.conf.erb'),
+    content => template($template_snmptrapd),
     require => Package['snmpd'],
     notify  => $snmptrapd_conf_notify,
   }
@@ -472,7 +482,7 @@
       owner   => 'root',
       group   => 'root',
       path    => $snmp::params::trap_sysconfig,
-      content => template("snmp/snmptrapd.sysconfig-${::osfamily}.erb"),
+      content => template($template_snmptrapd_sysconfig),
       require => Package['snmpd'],
       notify  => Service['snmptrapd'],
     }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -277,6 +277,11 @@
     $safe_trap_service_hasrestart = $trap_service_hasrestart
   }
 
+  $template_snmpd_conf = 'snmp/snmpd.conf.erb'
+  $template_snmpd_sysconfig = "snmp/snmpd.sysconfig-${::osfamily}.erb"
+  $template_snmptrapd = 'snmp/snmptrapd.conf.erb'
+  $template_snmptrapd_sysconfig = "snmp/snmptrapd.sysconfig-${::osfamily}.erb"
+
   case $::osfamily {
     'RedHat': {
       if $::operatingsystemmajrelease { # facter 1.7+