diff options
| author | varac <varacanero@zeromail.org> | 2014-04-08 16:39:40 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-04-10 10:07:45 +0200 |
| commit | e3d4c14648ff4e108cec28112c119ee7115a44cb (patch) | |
| tree | 6f6b9d840d3b4eaacd0681245cccf302c263ad5f /puppet/modules/site_check_mk/manifests/agent.pp | |
| parent | 615b5a218e843c9fe4e41729507b6ca1f14cf7b7 (diff) | |
fix check_mk resource dependency deploy errors (Bug #5272)
Diffstat (limited to 'puppet/modules/site_check_mk/manifests/agent.pp')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent.pp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp index b752182e..589041eb 100644 --- a/puppet/modules/site_check_mk/manifests/agent.pp +++ b/puppet/modules/site_check_mk/manifests/agent.pp @@ -4,7 +4,7 @@ class site_check_mk::agent { $pubkey = $ssh_hash['authorized_keys']['monitor']['key'] $type = $ssh_hash['authorized_keys']['monitor']['type'] - include site_apt::preferences::check_mk + class { 'site_apt::preferences::check_mk': } -> class { 'check_mk::agent': agent_package_name => 'check-mk-agent', @@ -12,17 +12,17 @@ class site_check_mk::agent { method => 'ssh', homedir => '/etc/nagios/check_mk', register_agent => false - } + } -> - file { [ '/srv/leap/nagios', '/srv/leap/nagios/plugins' ]: - ensure => directory, - } + class { 'site_check_mk::agent::mrpe': } -> + class { 'site_check_mk::agent::logwatch': } -> - file { '/usr/lib/check_mk_agent/local/run_node_tests.sh': - source => 'puppet:///modules/site_check_mk/agent/local_checks/all_hosts/run_node_tests.sh', - mode => '0755' + file { + [ '/srv/leap/nagios', '/srv/leap/nagios/plugins' ]: + ensure => directory; + '/usr/lib/check_mk_agent/local/run_node_tests.sh': + source => 'puppet:///modules/site_check_mk/agent/local_checks/all_hosts/run_node_tests.sh', + mode => '0755'; } - include site_check_mk::agent::mrpe - include site_check_mk::agent::logwatch } |