diff options
author | tylercloke <tylercloke@gmail.com> | 2015-07-01 15:58:05 -0700 |
---|---|---|
committer | tylercloke <tylercloke@gmail.com> | 2015-07-06 14:36:02 -0700 |
commit | e35250325f6836b464841441d33336c988b8ccc6 (patch) | |
tree | 290fea59f69f72ce5d412a313d918cbbce1dd766 /lib/chef/knife/user_delete.rb | |
parent | 320afd88bb6751b67573af982a0cf5d51a035af7 (diff) | |
download | chef-e35250325f6836b464841441d33336c988b8ccc6.tar.gz |
Move Chef::OscUser back to Chef::User namespace and new user code to Chef::UserV1.
Also, have Chef::User (formally Chef::OscUser) use API V0 to make requests.
Diffstat (limited to 'lib/chef/knife/user_delete.rb')
-rw-r--r-- | lib/chef/knife/user_delete.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/knife/user_delete.rb b/lib/chef/knife/user_delete.rb index 803be6b90c..828cd51588 100644 --- a/lib/chef/knife/user_delete.rb +++ b/lib/chef/knife/user_delete.rb @@ -23,7 +23,7 @@ class Chef class UserDelete < Knife deps do - require 'chef/user' + require 'chef/user_v1' require 'chef/json_compat' end @@ -55,7 +55,7 @@ EOF if Kernel.block_given? object = block.call else - object = Chef::User.load(user_name) + object = Chef::UserV1.load(user_name) object.destroy end @@ -77,10 +77,10 @@ EOF # Below is modification of Chef::Knife.delete_object to detect OSC 11 server. # When OSC 11 is deprecated, simply delete all this and go back to: # - # delete_object(Chef::User, @user_name) + # delete_object(Chef::UserV1, @user_name) # # Also delete our override of delete_object above - object = Chef::User.load(@user_name) + object = Chef::UserV1.load(@user_name) # OSC 11 case if object.username.nil? |