diff options
| author | Jon Cowie <jonlives@gmail.com> | 2018-03-05 12:08:10 +0000 |
|---|---|---|
| committer | Jon Cowie <jonlives@gmail.com> | 2018-03-05 12:08:10 +0000 |
| commit | 5913858c27fd7d4c5df27a85d12b9b4008970dc6 (patch) | |
| tree | 9161f7c3c7fbdd10c948e9180dca34d8990365be | |
| parent | 9209b0b0027971cf6bbd511ad67218774c4e615b (diff) | |
| download | chef-5913858c27fd7d4c5df27a85d12b9b4008970dc6.tar.gz | |
Remove redundant defensive code
Signed-off-by: Jon Cowie <jonlives@gmail.com>
| -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 |