Rename file config parameters to be file_atomic_update & file_staging_uses_destdir

2 files changed, 4 insertions, 7 deletions

diff --git a/lib/chef/file_content_management/deploy.rb b/lib/chef/file_content_management/deploy.rb
index a57af7b938..35ea3c6fc8 100644
--- a/lib/chef/file_content_management/deploy.rb
+++ b/lib/chef/file_content_management/deploy.rb
@@ -25,14 +25,11 @@ end
 class Chef
   class FileContentManagement
     class Deploy
-      def self.strategy(deploy_with)
-        case deploy_with
-        when :move
+      def self.strategy(atomic_update)
+        if atomic_update
           Chef::Platform.windows? ? MvWindows.new() : MvUnix.new()
-        when :copy
-          Cp.new()
         else
-          raise "invalid deployment strategy use :move or :copy"
+          Cp.new()
         end
       end
     end
diff --git a/lib/chef/file_content_management/tempfile.rb b/lib/chef/file_content_management/tempfile.rb
index 30ab89367b..d109e3f51f 100644
--- a/lib/chef/file_content_management/tempfile.rb
+++ b/lib/chef/file_content_management/tempfile.rb
@@ -52,7 +52,7 @@ class Chef
       end
 
       def tempfile_dirname
-        Chef::Config[:file_deployment_uses_destdir] ? ::File.dirname(@new_resource.path) : Dir::tmpdir
+        Chef::Config[:file_staging_uses_destdir] ? ::File.dirname(@new_resource.path) : Dir::tmpdir
       end
     end
   end