diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-07-06 17:00:18 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-06 23:57:56 -0700 |
| commit | 7978be59090b0bb25c2bc29ecb16ade33a8f50f6 (patch) | |
| tree | a367207fb2bc10b9c0b5d804e47911c170943ed2 | |
| parent | fb6f2aafa88d706425000f3677717368b98b5a3b (diff) | |
| download | puppet-7978be59090b0bb25c2bc29ecb16ade33a8f50f6.tar.gz puppet-7978be59090b0bb25c2bc29ecb16ade33a8f50f6.tar.xz puppet-7978be59090b0bb25c2bc29ecb16ade33a8f50f6.zip | |
[#3906] Fixed missing constant Puppet::Rails when using storeconfigs
The hook for storeconfig will now require 'puppet/rails' if the setting
is set to true. It was previously being indirectly required via
parser/interpreter, which was removed.
| -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 |