diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-07 15:51:59 +0000 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-10-07 15:51:59 +0000 |
commit | 7276068ec31d7f79f075593a3b1d480d1c95eb68 (patch) | |
tree | 4049f9972afc44d8843fa53d68508c7a7d8eeeeb /manifests | |
parent | 3ef601f3c83114a3e1aac62c3191f31b28931b76 (diff) | |
parent | 1aeeca2c1662c464d684dda1bf7c0128242f695b (diff) |
Merge branch 'master' into 'master'
check_mk: syntax fixes, linting, version overrides
A couple small commits to fix some syntax errors, cleanup whitespace and lint, and allow for version overrides
See merge request !4
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/agent/config.pp | 38 | ||||
-rw-r--r-- | manifests/agent/install.pp | 10 | ||||
-rw-r--r-- | manifests/agent/install_local.pp | 12 | ||||
-rw-r--r-- | manifests/host.pp | 2 | ||||
-rw-r--r-- | manifests/install.pp | 10 |
5 files changed, 50 insertions, 22 deletions
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp index 36f2910..5907d43 100644 --- a/manifests/agent/config.pp +++ b/manifests/agent/config.pp @@ -13,29 +13,30 @@ class check_mk::agent::config ( ) { if $use_cache { $server = "${server_dir}/check_mk_caching_agent" - } - else { + } else { $server = "${server_dir}/check_mk_agent" } + case $method { 'xinetd': { - if $ip_whitelist { - $only_from = join($ip_whitelist, ' ') - } - else { - $only_from = undef - } - file { '/etc/xinetd.d/check_mk': - ensure => present, - owner => 'root', - group => 'root', - mode => '0444', - content => template('check_mk/agent/check_mk.erb'), - require => Package['check_mk-agent','check_mk-agent-logwatch'], - notify => Class['check_mk::agent::service'], - } + if $ip_whitelist { + $only_from = join($ip_whitelist, ' ') + } else { + $only_from = undef + } + + file { '/etc/xinetd.d/check_mk': + ensure => present, + owner => 'root', + group => 'root', + mode => '0444', + content => template('check_mk/agent/check_mk.erb'), + require => Package['check_mk-agent','check_mk-agent-logwatch'], + notify => Class['check_mk::agent::service'], + } } - 'ssh' : { + + 'ssh': { if $generate_sshkey { check_mk::agent::generate_sshkey { "check_mk_key_${::fqdn}": keydir => $keydir, @@ -50,6 +51,7 @@ class check_mk::agent::config ( ensure => absent; } } + default : {} } } diff --git a/manifests/agent/install.pp b/manifests/agent/install.pp index 7225b20..5c0b56e 100644 --- a/manifests/agent/install.pp +++ b/manifests/agent/install.pp @@ -50,13 +50,19 @@ class check_mk::agent::install ( } } else { + if $version { + $agent_package_version = $version + } else { + $agent_package_version = latest + } + package { 'check_mk-agent': - ensure => latest, + ensure => $agent_package_version, name => $agent_package_name, require => $require_method, } package { 'check_mk-agent-logwatch': - ensure => latest, + ensure => $agent_package_version, name => $agent_logwatch_package_name, require => Package['check_mk-agent'], } diff --git a/manifests/agent/install_local.pp b/manifests/agent/install_local.pp new file mode 100644 index 0000000..77268db --- /dev/null +++ b/manifests/agent/install_local.pp @@ -0,0 +1,12 @@ +define check-mk::agent::install_local($source=undef, $content=undef, $ensure='present') { + @file { "/usr/lib/check_mk_agent/local/${name}" : + ensure => $ensure, + owner => 'root', + group => 'root', + mode => '0755', + content => $content, + source => $source, + tag => 'check-mk::local', + require => Package['check-mk-agent'], + } +} diff --git a/manifests/host.pp b/manifests/host.pp index 4e8d146..49f038b 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -4,7 +4,7 @@ define check_mk::host ( ) { $host = $title if size($host_tags) > 0 { - $taglist = join($host_tags,'|') + $taglist = join(any2array($host_tags),'|') $entry = "${host}|${taglist}" } else { diff --git a/manifests/install.pp b/manifests/install.pp index bb32146..5f8a4a0 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,5 +1,6 @@ class check_mk::install ( $filestore = '', + $version = '', $package, $site, $workspace, @@ -29,8 +30,15 @@ class check_mk::install ( } else { $package_name = $package + + if $version { + $server_package_version = $version + } else { + $server_package_version = latest + } + package { $package_name: - ensure => installed, + ensure => $server_package_version, } } $etc_dir = "/omd/sites/${site}/etc" |