diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-21 17:52:06 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-21 17:52:06 -0600 |
| commit | c59ff622a33b82f413207a146edd4ff6e011e729 (patch) | |
| tree | 7d7efd74b8aab5c8e9c0bbf7a3f90304edae9caf /lib/puppet/network | |
| parent | 4d28b10cd1ac8b549d488f18d272ad589c75445d (diff) | |
| download | puppet-c59ff622a33b82f413207a146edd4ff6e011e729.tar.gz puppet-c59ff622a33b82f413207a146edd4ff6e011e729.tar.xz puppet-c59ff622a33b82f413207a146edd4ff6e011e729.zip | |
Further fixes toward #965. Turned out that the previous fix
caused other problems.
This whole thing will hopefully get *drastically* easier once we
get rid of global resources.
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index 6e810b41b..6d1a0235f 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -206,15 +206,6 @@ class Puppet::Network::Client::Master < Puppet::Network::Client @running = false end - # Make the default objects necessary for function. - def make_default_resources - # First create the default scheduling objects - Puppet::Type.type(:schedule).mkdefaultschedules - - # And filebuckets - Puppet::Type.type(:filebucket).mkdefaultbucket - end - # Mark that we should restart. The Puppet module checks whether we're running, # so this only gets called if we're in the middle of a run. def restart @@ -263,9 +254,6 @@ class Puppet::Network::Client::Master < Puppet::Network::Client end if self.catalog - # Make our default schedules and such. - make_default_resources - @catalog.retrieval_duration = duration Puppet.notice "Starting catalog run" unless @local benchmark(:notice, "Finished catalog run") do |