lib/chef/knife/winrm_knife_base.rb in knife-windows-1.0.0 vs lib/chef/knife/winrm_knife_base.rb in knife-windows-1.1.0
- old
+ new
@@ -32,11 +32,11 @@
include Chef::Knife::WinrmBase
include Chef::Knife::WinrmSharedOptions
include Chef::Knife::KnifeWindowsBase
- def validate_options!
+ def validate_winrm_options!
winrm_auth_protocol = locate_config_value(:winrm_authentication_protocol)
if ! Chef::Knife::WinrmBase::WINRM_AUTH_PROTOCOL_LIST.include?(winrm_auth_protocol)
ui.error "Invalid value '#{winrm_auth_protocol}' for --winrm-authentication-protocol option."
ui.info "Valid values are #{Chef::Knife::WinrmBase::WINRM_AUTH_PROTOCOL_LIST.join(",")}."
@@ -58,10 +58,10 @@
end
#Overrides Chef::Knife#configure_session, as that code is tied to the SSH implementation
#Tracked by Issue # 3042 / https://github.com/chef/chef/issues/3042
def configure_session
- validate_options!
+ validate_winrm_options!
resolve_session_options
resolve_target_nodes
session_from_list
end