diff options
| author | Luke Kanies <luke@madstop.com> | 2008-06-15 13:58:37 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-06-15 13:58:37 -0500 |
| commit | 1f19453dddf0f3a7822c21157f6f8d06c388cdb8 (patch) | |
| tree | 758d40c4aa31021eaa40a849fe75d94ba1cbc010 /lib | |
| parent | 51e1ba8c02f1bd9085ef15138c4828accbb29dec (diff) | |
| download | puppet-1f19453dddf0f3a7822c21157f6f8d06c388cdb8.tar.gz puppet-1f19453dddf0f3a7822c21157f6f8d06c388cdb8.tar.xz puppet-1f19453dddf0f3a7822c21157f6f8d06c388cdb8.zip | |
Removing the Node.find_by_name method.
We just use the regular Node.find method now, since
the nodes don't need to do any magical naming.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector/catalog/compiler.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/node.rb | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb index 2b5e8d912..455a92cc7 100644 --- a/lib/puppet/indirector/catalog/compiler.rb +++ b/lib/puppet/indirector/catalog/compiler.rb @@ -89,7 +89,7 @@ class Puppet::Node::Catalog::Compiler < Puppet::Indirector::Code # key = client #end - return nil unless node = Puppet::Node.find_by_any_name(key) + return nil unless node = Puppet::Node.find(key) # Add any external data to the node. add_node_data(node) diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index 75b7197fd..14d0f6ac7 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -13,13 +13,6 @@ class Puppet::Node indirects :node, :terminus_setting => :node_terminus, :doc => "Where to find node information. A node is composed of its name, its facts, and its environment." - # Retrieve a node from the node source, with some additional munging - # thrown in for kicks. - def self.find_by_any_name(key) - return nil unless key - find(key) - end - attr_accessor :name, :classes, :parameters, :source, :ipaddress attr_reader :time |