diff options
| author | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 09:34:56 -0500 |
|---|---|---|
| committer | Gabriel Filion <gabster@lelutin.ca> | 2014-12-13 10:21:25 -0500 |
| commit | 48272434978f95c70e34aebe9ce188157f8f935e (patch) | |
| tree | 8c940d891cbcba026d56cf8ed2935361debc44fd /manifests/register.pp | |
| parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
| parent | 27c9a5dbc2083dcc20d059008702dd3f75382bcc (diff) | |
Merge remote-tracking branch 'immerda/master' into merge_immerda
Conflicts:
manifests/plugins/interfaces.pp
$real_ifs was changed on master and we'd like to keep that change
$ifs was changed to use the prefix() function and we'd like to keep that
change.
Diffstat (limited to 'manifests/register.pp')
| -rw-r--r-- | manifests/register.pp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/manifests/register.pp b/manifests/register.pp index 309c322..8c1ec61 100644 --- a/manifests/register.pp +++ b/manifests/register.pp @@ -1,10 +1,12 @@ +# Register a munin client define munin::register ( - $host = $::fqdn, - $port = '4949', - $use_ssh = false, - $description = 'absent', - $config = [], - $export_tag = 'munin' + $host = $::fqdn, + $port = '4949', + $use_ssh = false, + $description = 'absent', + $config = [], + $export_tag = 'munin', + $group = 'absent', ) { $fhost = $name @@ -12,7 +14,7 @@ define munin::register ( @@concat::fragment{ "munin_client_${fhost}_${port}": target => '/etc/munin/munin.conf', - content => template("munin/client.erb"), + content => template('munin/client.erb'), tag => $export_tag, } } |