Detect when user wants policyfile compat mode

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/chef/policy_builder/dynamic.rb b/lib/chef/policy_builder/dynamic.rb
index d2849dd4f1..0f266a25fb 100644
--- a/lib/chef/policy_builder/dynamic.rb
+++ b/lib/chef/policy_builder/dynamic.rb
@@ -112,7 +112,10 @@ class Chef
       end
 
       def select_implementation(node)
-        if policyfile_set_in_config? || policyfile_attribs_in_node_json? || node_has_policyfile_attrs?(node)
+        if policyfile_set_in_config? ||
+            policyfile_attribs_in_node_json? ||
+            node_has_policyfile_attrs?(node) ||
+            policyfile_compat_mode_config?
           @implementation = Policyfile.new(node_name, ohai_data, json_attribs, override_runlist, events)
         else
           @implementation = ExpandNodeObject.new(node_name, ohai_data, json_attribs, override_runlist, events)
@@ -137,6 +140,10 @@ class Chef
         config[:use_policyfile] || config[:policy_name] || config[:policy_group]
       end
 
+      def policyfile_compat_mode_config?
+        config[:deployment_group] && !config[:policy_document_native_api]
+      end
+
     end
   end
 end