diff options
| -rw-r--r-- | lib/chef/policy_builder/policyfile.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb index 900abb23cc..e1293190f8 100644 --- a/lib/chef/policy_builder/policyfile.rb +++ b/lib/chef/policy_builder/policyfile.rb @@ -263,10 +263,7 @@ class Chef def apply_policyfile_attributes node.attributes.role_default = policy["default_attributes"] node.attributes.role_override = policy["override_attributes"] - policy_group = (defined?(node.policy_group) && node.policy_group) || \ - Chef::Config[:policy_group] || \ - (Chef::Config[:deployment_group] && Chef::Config[:deployment_group].split(/-/).last) - hoist_policyfile_attributes(policy_group) if policy_group + hoist_policyfile_attributes(node.policy_group) if node.policy_group end # @api private |