Merge d1ea219 into 6e76786

manifests/plugin/write_network.pp

@@ -1,23 +1,22 @@
 # A define to make a generic network output for collectd
 class collectd::plugin::write_network (
   $ensure  = 'present',
-  $servers = { 'localhost'  =>  { 'serverport' => '25826' } },
+  $server = 'localhost',
+  $port = '25826',
 ) {
 
   include ::collectd
 
-  validate_hash($servers)
+  validate_string($server)
+  validate_re($port, '^\d{1,5}$')
 
-  $servernames = keys($servers)
-  if empty($servernames) {
-    fail('servers cannot be empty')
+  if empty($server) {
+    fail('server cannot be empty')
   }
 
-  $servername = $servernames[0]
-  $serverport = $servers[$servername]['serverport']
-
-  class { '::collectd::plugin::network':
-    server     => $servername,
-    serverport => $serverport,
+  ::collectd::plugin::network::server {$server :
+    ensure => $ensure,
+    port   => $port,
   }
+
 }