diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/agent.pp | 5 | ||||
-rw-r--r-- | manifests/agent/config.pp | 1 | ||||
-rw-r--r-- | manifests/agent/install.pp | 2 | ||||
-rw-r--r-- | manifests/config.pp | 6 | ||||
-rw-r--r-- | manifests/hostgroup.pp | 2 | ||||
-rw-r--r-- | manifests/install.pp | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/manifests/agent.pp b/manifests/agent.pp index 8ed872a..dc13388 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -8,14 +8,15 @@ class check_mk::agent ( $version = undef, $workspace = '/root/check_mk', ) { - class check_mk::agent::install { + class { 'check_mk::agent::install': version => $version, filestore => $filestore, workspace => $workspace, } - class check_mk::agent::config { + class { 'check_mk::agent::config': ip_whitelist => $ip_whitelist, port => $port, + server_dir => $server_dir, use_cache => $use_cache, user => $user, require => Class['check_mk::agent::install'], diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp index 2456648..dc6808a 100644 --- a/manifests/agent/config.pp +++ b/manifests/agent/config.pp @@ -1,6 +1,7 @@ class check_mk::agent::config ( $ip_whitelist, $port, + $server_dir, $use_cache, $user, ) { diff --git a/manifests/agent/install.pp b/manifests/agent/install.pp index 4d7dc29..1c8a429 100644 --- a/manifests/agent/install.pp +++ b/manifests/agent/install.pp @@ -37,7 +37,7 @@ class check_mk::agent::install ( require => [ File["${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm"], Package['check_mk-agent'], - ], + ], } } else { diff --git a/manifests/config.pp b/manifests/config.pp index 36dbb30..2a6f827 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,6 +1,6 @@ class check_mk::config ( - site, - host_groups = undef, + $site, + $host_groups = undef, ) { $etc_dir = "/omd/sites/${site}/etc" $bin_dir = "/omd/sites/${site}/bin" @@ -69,8 +69,8 @@ class check_mk::config ( } # local config is in /omd/sites/${site}/etc/check_mk/main.mk.local and is appended concat::fragment { 'check_mk-local-config': - target => "${etc_dir}/check_mk/main.mk", ensure => "${etc_dir}/check_mk/main.mk.local", + target => "${etc_dir}/check_mk/main.mk", order => 99, } # re-read config if it changes diff --git a/manifests/hostgroup.pp b/manifests/hostgroup.pp index 756ef50..ac66a16 100644 --- a/manifests/hostgroup.pp +++ b/manifests/hostgroup.pp @@ -5,7 +5,7 @@ define check_mk::hostgroup ( ) { $group = $title $group_tags = join($hostgroups[$group], ',') - concat::fragment { "check_mk-hostgroup-${host}": + concat::fragment { "check_mk-hostgroup-${group}": target => $target, content => " ( '${group}', [ ${group_tags} ], ALL_HOSTS ),\n", order => 21, diff --git a/manifests/install.pp b/manifests/install.pp index 28c645f..ce49c46 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -19,7 +19,7 @@ class check_mk::install ( package { 'omd': ensure => installed, provider => $type, - source => "${workspace}/${package_file}", + source => "${workspace}/${package}", require => File["${workspace}/${package}"], } } |