diff options
| author | tylercloke <tylercloke@gmail.com> | 2015-07-02 15:11:05 -0700 |
|---|---|---|
| committer | tylercloke <tylercloke@gmail.com> | 2015-07-06 14:36:04 -0700 |
| commit | 78eba34a405fdc2332ffa5355c41e75f8b967e80 (patch) | |
| tree | deca52aaf2bb598aa7cee0c69b96c35cc822edd5 | |
| parent | e1960b315b55fba380bfc3837c7655bbd6dd1a4d (diff) | |
| download | chef-78eba34a405fdc2332ffa5355c41e75f8b967e80.tar.gz | |
Allow cookbooks_dir to use chef_rest instead of rest for now.
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server_root_dir.rb | 8 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/cookbooks_dir.rb | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb index 4ec4e45c54..824325f31b 100644 --- a/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server_root_dir.rb @@ -97,15 +97,7 @@ class Chef Chef::ServerAPI.new(chef_server_url, :client_name => chef_username, :signing_key_filename => chef_private_key, :api_version => "0").get(path) end - def chef_rest_deprecation_method -<<-EOH -The chef_rest method is being removed from ChefServerRootDir in Chef 13. -Please update your code to use the rest method instead. -EOH - end - def chef_rest - Chef::Log.deprecation(chef_rest_deprecation_method) Chef::REST.new(chef_server_url, chef_username, chef_private_key) end diff --git a/lib/chef/chef_fs/file_system/cookbooks_dir.rb b/lib/chef/chef_fs/file_system/cookbooks_dir.rb index 3864601622..27bedd3827 100644 --- a/lib/chef/chef_fs/file_system/cookbooks_dir.rb +++ b/lib/chef/chef_fs/file_system/cookbooks_dir.rb @@ -106,7 +106,7 @@ class Chef cookbook_to_upload.freeze_version if options[:freeze] # Instantiate a new uploader based on the proxy loader - uploader = Chef::CookbookUploader.new(cookbook_to_upload, :force => options[:force], :rest => root.rest) + uploader = Chef::CookbookUploader.new(cookbook_to_upload, :force => options[:force], :rest => root.chef_rest) with_actual_cookbooks_dir(temp_cookbooks_path) do upload_cookbook!(uploader) @@ -128,7 +128,7 @@ class Chef def upload_unversioned_cookbook(other, options) cookbook_to_upload = other.chef_object cookbook_to_upload.freeze_version if options[:freeze] - uploader = Chef::CookbookUploader.new(cookbook_to_upload, :force => options[:force], :rest => root.rest) + uploader = Chef::CookbookUploader.new(cookbook_to_upload, :force => options[:force], :rest => root.chef_rest) with_actual_cookbooks_dir(other.parent.file_path) do upload_cookbook!(uploader) |