diff options
Diffstat (limited to 'lib/puppet/util')
| -rwxr-xr-x | lib/puppet/util/loadedfile.rb | 7 | ||||
| -rw-r--r-- | lib/puppet/util/metric.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/util/storage.rb | 2 |
3 files changed, 1 insertions, 20 deletions
diff --git a/lib/puppet/util/loadedfile.rb b/lib/puppet/util/loadedfile.rb index 362b5df09..ceb53bca4 100755 --- a/lib/puppet/util/loadedfile.rb +++ b/lib/puppet/util/loadedfile.rb @@ -12,13 +12,6 @@ module Puppet # have to depend on the granularity of the filesystem. attr_writer :tstamp - Puppet.config.setdefaults(:puppet, - :filetimeout => [ 15, - "The minimum time to wait between checking for updates in - configuration files." - ] - ) - # Determine whether the file has changed and thus whether it should # be reparsed. def changed? diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb index 73a1618e2..19d56c543 100644 --- a/lib/puppet/util/metric.rb +++ b/lib/puppet/util/metric.rb @@ -3,18 +3,6 @@ require 'puppet' # A class for handling metrics. This is currently ridiculously hackish. class Puppet::Util::Metric - Puppet.config.setdefaults("metrics", - :rrddir => {:default => "$vardir/rrd", - :owner => "$user", - :group => "$group", - :desc => "The directory where RRD database files are stored. - Directories for each reporting host will be created under - this directory." - }, - :rrdgraph => [false, "Whether RRD information should be graphed."], - :rrdinterval => ["$runinterval", "How often RRD should expect data. - This should match how often the hosts report back to the server."] - ) # Load the library as a feature, so we can test its presence. Puppet.features.add :rrd, :libs => 'RRD' diff --git a/lib/puppet/util/storage.rb b/lib/puppet/util/storage.rb index d76c67433..a10183615 100644 --- a/lib/puppet/util/storage.rb +++ b/lib/puppet/util/storage.rb @@ -46,7 +46,7 @@ class Puppet::Util::Storage self.init def self.load - Puppet.config.use(:puppet) + Puppet.config.use(:main) unless File.exists?(Puppet[:statefile]) unless defined? @@state and ! @@state.nil? |