diff options
author | Thom May <thom@chef.io> | 2018-03-09 13:37:18 +0000 |
---|---|---|
committer | Thom May <thom@chef.io> | 2018-03-09 13:37:18 +0000 |
commit | a09fa9c514539a49edd7115917aa79d4ad49976f (patch) | |
tree | d6ed49d3f0758c584d3fe4d4b2bbcc0b609d3417 /lib/chef/node.rb | |
parent | 27de91563e5311cf17fdb53e7542db553787ec2f (diff) | |
download | chef-a09fa9c514539a49edd7115917aa79d4ad49976f.tar.gz |
RFC 106: expose name and chef_environment as attrstm/chef_environment
We also now set chef_environment the same as policy group when that's
appropriate
Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'lib/chef/node.rb')
-rw-r--r-- | lib/chef/node.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/chef/node.rb b/lib/chef/node.rb index 7b530e1132..496bfedc15 100644 --- a/lib/chef/node.rb +++ b/lib/chef/node.rb @@ -330,6 +330,8 @@ class Chef Chef::Log.debug("Platform is #{platform} version #{version}") automatic[:platform] = platform automatic[:platform_version] = version + automatic[:name] = name + automatic[:chef_environment] = chef_environment end def consume_ohai_data(ohai_data) @@ -421,6 +423,7 @@ class Chef apply_expansion_attributes(expansion) + automatic_attrs[:chef_environment] = chef_environment expansion end @@ -510,7 +513,16 @@ class Chef return o if o.kind_of? Chef::Node node = new node.name(o["name"]) - node.chef_environment(o["chef_environment"]) + + node.policy_name = o["policy_name"] if o.has_key?("policy_name") + node.policy_group = o["policy_group"] if o.has_key?("policy_group") + + unless node.policy_group.nil? + node.chef_environment(o["policy_group"]) + else + node.chef_environment(o["chef_environment"]) + end + if o.has_key?("attributes") node.normal_attrs = o["attributes"] end @@ -525,9 +537,6 @@ class Chef o["recipes"].each { |r| node.recipes << r } end - node.policy_name = o["policy_name"] if o.has_key?("policy_name") - node.policy_group = o["policy_group"] if o.has_key?("policy_group") - node end |