diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/defaults.rb | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index b5c480636..fbf5ccf73 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -168,8 +168,3 @@ require 'puppet/module' require 'puppet/util/storage' require 'puppet/status' require 'puppet/file_bucket/file' - -if Puppet[:storeconfigs] - require 'puppet/rails' -end - diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index ed0623127..6ded3c0fe 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -763,6 +763,7 @@ module Puppet require 'puppet/node' require 'puppet/node/facts' if value + require 'puppet/rails' raise "StoreConfigs not supported without ActiveRecord 2.1 or higher" unless Puppet.features.rails? Puppet::Resource::Catalog.cache_class = :active_record unless Puppet.settings[:async_storeconfigs] Puppet::Node::Facts.cache_class = :active_record |