diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/parser/interpreter.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/server/master.rb | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index 5f5ecbe1f..f443ee3cd 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -77,6 +77,8 @@ module Puppet # by the cfengine module. @classes = hash[:Classes] || [] + @local = hash[:Local] || false + # Create our parser object parsefiles end @@ -292,8 +294,12 @@ module Puppet @parser.file = @file end - @ast = benchmark(:info, "Parsed manifest") do + if @local @parser.parse + else + @ast = benchmark(:info, "Parsed manifest") do + @parser.parse + end end # Mark when we parsed, so we can check freshness diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb index bdae877a9..95d81cdf6 100644 --- a/lib/puppet/server/master.rb +++ b/lib/puppet/server/master.rb @@ -19,6 +19,16 @@ class Server iface.add_method("int freshness()") } + # FIXME At some point, this should be autodocumenting. + def addfacts(facts) + # Add our server version to the fact list + facts["serverversion"] = Puppet.version.to_s + + # And then add the server name and IP + facts["servername"] = Facter["hostname"].value + facts["serverip"] = Facter["ipaddress"].value + end + def filetimeout @interpreter.filetimeout end @@ -52,6 +62,8 @@ class Server @local = false end + args[:Local] = @local + if hash.include?(:CA) and hash[:CA] @ca = Puppet::SSLCertificates::CA.new() else @@ -115,8 +127,8 @@ class Server clientip = facts["ipaddress"] end - # Add our server version to the fact list - facts["serverversion"] = Puppet.version.to_s + # Add any server-side facts to our server. + addfacts(facts) retobjects = nil |