diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-06 13:25:12 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-06 13:25:12 -0500 |
| commit | 42b98562b5237797e1a51fdcdd57aa3c6825b404 (patch) | |
| tree | 0f5cc25fb42b348f3c851c988f3b86979871794a /lib/puppet/network/handler/master.rb | |
| parent | 1befcc46926a27ec5f799d6ad8caa59c3b808c4c (diff) | |
| parent | cdaad286b1fe5fc3c1ab363c890bb6a8a752c9b5 (diff) | |
Merge branch 'master' of git://reductivelabs.com/puppet into routing
Diffstat (limited to 'lib/puppet/network/handler/master.rb')
| -rw-r--r-- | lib/puppet/network/handler/master.rb | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 25c4318b8..1c7f7310e 100644 --- a/lib/puppet/network/handler/master.rb +++ b/lib/puppet/network/handler/master.rb @@ -30,13 +30,6 @@ class Puppet::Network::Handler def initialize(hash = {}) args = {} - # Allow specification of a code snippet or of a file - if code = hash[:Code] - args[:Code] = code - elsif man = hash[:Manifest] - args[:Manifest] = man - end - if hash[:Local] @local = hash[:Local] else @@ -53,12 +46,6 @@ class Puppet::Network::Handler Puppet.debug("Creating interpreter") - if hash.include?(:UseNodes) - args[:UseNodes] = hash[:UseNodes] - elsif @local - args[:UseNodes] = false - end - # This is only used by the cfengine module, or if --loadclasses was # specified in +puppet+. if hash.include?(:Classes) @@ -74,7 +61,7 @@ class Puppet::Network::Handler client, clientip = clientname(client, clientip, facts) # Pass the facts to the fact handler - Puppet::Node::Facts.new(client, facts).save + Puppet::Node::Facts.new(client, facts).save unless local? # And get the configuration from the config handler config = config_handler.configuration(client) |