From 1f19453dddf0f3a7822c21157f6f8d06c388cdb8 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Sun, 15 Jun 2008 13:58:37 -0500 Subject: 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. --- lib/puppet/indirector/catalog/compiler.rb | 2 +- lib/puppet/node.rb | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'lib') 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 -- cgit