From e3d4c14648ff4e108cec28112c119ee7115a44cb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 8 Apr 2014 16:39:40 +0200
Subject: fix  check_mk resource dependency deploy errors (Bug #5272)

---
 puppet/modules/site_check_mk/manifests/agent.pp      | 20 ++++++++++----------
 puppet/modules/site_check_mk/manifests/agent/mx.pp   |  5 +++--
 .../modules/site_check_mk/manifests/agent/webapp.pp  | 10 ++++++----
 3 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'puppet')

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
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/mx.pp b/puppet/modules/site_check_mk/manifests/agent/mx.pp
index 2dd50400..35a4e9a5 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mx.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mx.pp
@@ -15,8 +15,9 @@ class site_check_mk::agent::mx {
 
   # check stale files in queue dir
   file { '/usr/lib/check_mk_agent/local/check_leap_mx.sh':
-    source => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
-    mode   => '0755'
+    source  => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
+    mode    => '0755',
+    require => Package['check_mk-agent']
   }
 
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index cb160d83..64f5ea6d 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -5,12 +5,14 @@ class site_check_mk::agent::webapp {
     ensure => installed
   }
   file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
-    ensure => link,
-    target => '/srv/leap/webapp/test/nagios/webapp_login.py'
+    ensure  => link,
+    target  => '/srv/leap/webapp/test/nagios/webapp_login.py',
+    require => Package['check_mk-agent']
   }
   file { '/usr/lib/check_mk_agent/local/soledad_sync.py':
-    ensure => link,
-    target => '/srv/leap/webapp/test/nagios/soledad_sync.py'
+    ensure  => link,
+    target  => '/srv/leap/webapp/test/nagios/soledad_sync.py',
+    require => Package['check_mk-agent']
   }
 
 
-- 
cgit v1.2.3