summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-13 18:18:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-13 18:18:33 -0300
commitba0c4fedf86e594c307aa514c982faaa988ab493 (patch)
treea18942b139c9e7479e60937a7241d9fa56d9f118
parentf60b26cce5eb8c8a258a5881c6d96a474dd51fb9 (diff)
downloadpuppet-puppet-ba0c4fedf86e594c307aa514c982faaa988ab493.tar.gz
puppet-puppet-ba0c4fedf86e594c307aa514c982faaa988ab493.tar.bz2
Master class shall not include the daemon
-rw-r--r--manifests/daemon.pp1
-rw-r--r--manifests/master.pp5
2 files changed, 0 insertions, 6 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 6b17f8d..7489b6e 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,4 +1,3 @@
-# handles puppetd service
class puppet::daemon(
$master = false,
$ensure = hiera('puppet::daemon::ensure', ''),
diff --git a/manifests/master.pp b/manifests/master.pp
index 8ea4928..2d34b91 100644
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -19,11 +19,6 @@ class puppet::master(
include puppet::master::ca
}
- # then include the daemon
- class { 'puppet::daemon':
- master => true,
- }
-
# needed packages
package {
"sqlite3": ensure => installed;