summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/interpreter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/interpreter.rb')
-rw-r--r--lib/puppet/parser/interpreter.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index ad2487f11..a00b10042 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -778,7 +778,9 @@ class Puppet::Parser::Interpreter
"storeconfigs is enabled but rails is unavailable"
end
- Puppet::Rails.init
+ unless ActiveRecord::Base.connected?
+ Puppet::Rails.init
+ end
# Fork the storage, since we don't need the client waiting
# on that. How do I avoid this duplication?