From 6e22a40283bf8d882e2bbcc7030cc9311cdd05a2 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Thu, 9 Feb 2012 09:10:34 +0000
Subject: do not inherit, better to include puppet::client

---
 modules/puppet/manifests/init.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/puppet')

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 ? {
-- 
cgit v1.2.1