From: Stephen Gran <steve@lobefin.net>
Date: Tue, 21 Jul 2009 14:59:13 +0000 (+0100)
Subject: stop trying to start/reload/stop/etc puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f30cae69e4b599f88fb50a562095ee0de56a612e;p=dsa-puppet.git

stop trying to start/reload/stop/etc puppet

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 37c98fb0..a31ee292 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -51,10 +51,8 @@ class debian-org {
              notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
              source => "puppet:///files/etc/puppet/puppet.conf",
-             notify  => Exec["puppet reload"];
       "/etc/default/puppet":
              source => "puppet:///files/etc/default/puppet",
-             require => Exec["puppet stop"];
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
@@ -87,18 +85,6 @@ class debian-org {
         default: {}
    }
 
-   exec { "puppet reload":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
-   exec { "puppetmaster restart":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
-   exec { "puppet stop":
-             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-             refreshonly => true,
-   }
    exec { "syslog-ng reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,