summaryrefslogtreecommitdiff
path: root/lib/chef/node.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/node.rb')
-rw-r--r--lib/chef/node.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index 92bdb5887b..549bde0dbb 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -338,6 +338,10 @@ class Chef
automatic[:platform_version] = version
end
+ def consume_ohai_data(ohai_data)
+ self.automatic_attrs = Chef::Mixin::DeepMerge.merge(automatic_attrs, ohai_data)
+ end
+
# Consumes the combined run_list and other attributes in +attrs+
def consume_attributes(attrs)
normal_attrs_to_merge = consume_run_list(attrs)