From 394bbf20845eba2286ab19fa100b0a01b3a9692a Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 11 Feb 2012 12:41:42 +0000 Subject: fix error due to last change ( ie, we need to have proper inheritance in place for subclassing ) --- modules/puppet/manifests/client.pp | 5 ++--- modules/puppet/manifests/init.pp | 4 ++++ modules/puppet/manifests/master.pp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/puppet/manifests/client.pp b/modules/puppet/manifests/client.pp index 2969ad2d..6d920a74 100644 --- a/modules/puppet/manifests/client.pp +++ b/modules/puppet/manifests/client.pp @@ -1,11 +1,10 @@ -class puppet::client { +class puppet::client inherits puppet { include puppet::stored_config package { 'puppet': } - file { '/etc/puppet/puppet.conf': + File['/etc/puppet/puppet.conf'] { content => template('puppet/puppet.conf','puppet/puppet.agent.conf'), - require => Package[puppet], } cron { 'puppet': diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index 7c8f2111..38c74bd2 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -1,2 +1,6 @@ class puppet { + # only here to be subclassed + file { '/etc/puppet/puppet.conf': + require => Package[puppet], + } } diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp index 4997c90b..7e524cef 100644 --- a/modules/puppet/manifests/master.pp +++ b/modules/puppet/manifests/master.pp @@ -1,4 +1,4 @@ -class puppet::master { +class puppet::master inherits puppet { include puppet::client include puppet::queue include puppet::stored_config -- cgit v1.2.1