ocsinventory: tag option added to client

daks · Mar 28, 2012 · 70edfd1 · 70edfd1
1 parent 26939ae
commit 70edfd1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/ocsinventory/README b/ocsinventory/README
@@ -20,3 +20,5 @@ ocsinventory::agent
         ocs_server (mandatory):
             the ocsinventory server to send inventories
 
+        ocs_tag (optional):
+            a tag for ocsinventory client
diff --git a/ocsinventory/manifests/init.pp b/ocsinventory/manifests/init.pp
@@ -9,6 +9,11 @@
         ensure => installed,
     }
 
+
+    $tag = $ocs_tag ? {
+        undef   => '',
+        default => "$ocs_tag",
+    }
     file { "/etc/ocsinventory/ocsinventory-agent.cfg":
         ensure  => present,
         content => template("ocsinventory/ocsinventory-agent.cfg.erb"),

diff --git a/ocsinventory/templates/ocsinventory-agent.cfg.erb b/ocsinventory/templates/ocsinventory-agent.cfg.erb
@@ -6,3 +6,4 @@
 # module ocsinventory
 
 server=<%= ocs_server %>
+<% if tag != '' %>tag=<%= tag %><% end %>
diff --git a/snmp/manifests/server.pp b/snmp/manifests/server.pp
@@ -17,6 +17,7 @@
                     "puppet:///files/${domain}/etc/snmp/snmpd.conf",
                     "puppet:///files/global/etc/snmp/snmpd.conf",
                    ],
+        notify  => Service["${snmp::params::srv_name}"],
     }
 
     service { "${snmp::params::srv_name}":