diff options
| author | Michael Scherer <misc@mageia.org> | 2012-02-11 12:41:42 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-02-11 12:41:42 +0000 |
| commit | 394bbf20845eba2286ab19fa100b0a01b3a9692a (patch) | |
| tree | 9a862c8f536931571c05acbb4d3c5439dcdc8999 | |
| parent | 07a9c48a5a1a1ea011adc4e13e1663787ca0ba46 (diff) | |
| download | puppet-394bbf20845eba2286ab19fa100b0a01b3a9692a.tar puppet-394bbf20845eba2286ab19fa100b0a01b3a9692a.tar.gz puppet-394bbf20845eba2286ab19fa100b0a01b3a9692a.tar.bz2 puppet-394bbf20845eba2286ab19fa100b0a01b3a9692a.tar.xz puppet-394bbf20845eba2286ab19fa100b0a01b3a9692a.zip | |
fix error due to last change ( ie, we need to have proper inheritance in place for subclassing )
| -rw-r--r-- | modules/puppet/manifests/client.pp | 5 | ||||
| -rw-r--r-- | modules/puppet/manifests/init.pp | 4 | ||||
| -rw-r--r-- | 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 |