From 804105d925b526bcf209910172bc14bdeafaf4e7 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 6 Jan 2010 16:19:09 -0800 Subject: Moving Rails initialization to Compiler terminus It was previously handled by the Interpreter, but we're planning on getting of that. Signed-off-by: Luke Kanies --- lib/puppet/parser/interpreter.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'lib/puppet/parser') diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index bc0ae4fdf..1b158209d 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -17,11 +17,6 @@ class Puppet::Parser::Interpreter include Puppet::Util::Errors - # Determine the configuration version for a given node's environment. - def configuration_version(node) - parser(node.environment).version - end - # evaluate our whole tree def compile(node) raise Puppet::ParseError, "Could not parse configuration; cannot compile on node %s" % node.name unless env_parser = parser(node.environment) @@ -35,15 +30,6 @@ class Puppet::Parser::Interpreter # create our interpreter def initialize - # The class won't always be defined during testing. - if Puppet[:storeconfigs] - if Puppet.features.rails? - Puppet::Rails.init - else - raise Puppet::Error, "Rails is missing; cannot store configurations" - end - end - @parsers = {} end @@ -61,7 +47,7 @@ class Puppet::Parser::Interpreter # Create a new parser object and pre-parse the configuration. def create_parser(environment) begin - parser = Puppet::Parser::Parser.new(:environment => environment) + parser = Puppet::Parser::Parser.new(environment) if code = Puppet.settings.uninterpolated_value(:code, environment) and code != "" parser.string = code else -- cgit