aboutsummaryrefslogtreecommitdiffstats
path: root/modules/puppet
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-09 09:10:34 +0000
committerMichael Scherer <misc@mageia.org>2012-02-09 09:10:34 +0000
commit6e22a40283bf8d882e2bbcc7030cc9311cdd05a2 (patch)
tree8eb1753dac854f99f5238390dc9cf09e0608563c /modules/puppet
parent62dc1333633d07f8266a385d3315df29f25b28fe (diff)
downloadpuppet-6e22a40283bf8d882e2bbcc7030cc9311cdd05a2.tar
puppet-6e22a40283bf8d882e2bbcc7030cc9311cdd05a2.tar.gz
puppet-6e22a40283bf8d882e2bbcc7030cc9311cdd05a2.tar.bz2
puppet-6e22a40283bf8d882e2bbcc7030cc9311cdd05a2.tar.xz
puppet-6e22a40283bf8d882e2bbcc7030cc9311cdd05a2.zip
do not inherit, better to include puppet::client
Diffstat (limited to 'modules/puppet')
-rw-r--r--modules/puppet/manifests/init.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp
index 82d7ddeb..8eb7a184 100644
--- a/modules/puppet/manifests/init.pp
+++ b/modules/puppet/manifests/init.pp
@@ -21,7 +21,8 @@ class puppet {
}
}
- class master inherits client {
+ class master {
+ include puppet::client
# for stored config
$rails_package = $lsbdistid ? {