summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2012-10-17 15:35:51 -0700
committerdanielsdeleo <dan@opscode.com>2012-10-19 14:15:59 -0700
commitddaf9cac6123fa459132c15b3f219f03578dcefb (patch)
tree705cefd9cc5c52d483259e8d1b61ae23f53d999f
parente083a113ca44e39ec6faeac270ef8f607071596c (diff)
downloadchef-ddaf9cac6123fa459132c15b3f219f03578dcefb.tar.gz
[CHEF-2992] remove remaining attribute loading code from Node
-rw-r--r--chef/lib/chef/node.rb14
1 files changed, 1 insertions, 13 deletions
diff --git a/chef/lib/chef/node.rb b/chef/lib/chef/node.rb
index 39d338e516..eef6aeb139 100644
--- a/chef/lib/chef/node.rb
+++ b/chef/lib/chef/node.rb
@@ -158,8 +158,7 @@ class Chef
@couchdb = couchdb || Chef::CouchDB.new
@run_state = {
- :template_cache => Hash.new,
- :seen_attributes => Hash.new
+ :template_cache => Hash.new
}
end
@@ -639,16 +638,5 @@ class Chef
"node[#{name}]"
end
- # Load all attribute files for all cookbooks associated with this
- # node.
- def load_attributes
- cookbook_collection.values.each do |cookbook|
- cookbook.segment_filenames(:attributes).each do |segment_filename|
- Chef::Log.debug("Node #{name} loading cookbook #{cookbook.name}'s attribute file #{segment_filename}")
- self.from_file(segment_filename)
- end
- end
- end
-
end
end