Don't treat name_property/attribute as defaults if they are false

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index 011ff93aef..d699f16a9d 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -89,7 +89,11 @@ class Chef
 
       # Only pick the first of :default, :name_property and :name_attribute if
       # more than one is specified.
-      found_defaults = options.keys.select { |k| [ :default, :name_attribute, :name_property ].include?(k) }
+      found_defaults = options.keys.select do |k|
+         # Only treat name_property or name_attribute as a default if they are `true`
+        k == :default ||
+        ((k == :name_property || k == :name_attribute) && options[k])
+      end
       if found_defaults.size > 1
         preferred_default = found_defaults[0]
         # We do *not* prefer `default: nil` even if it's first, because earlier