Skip to content

Commit

Permalink
Merge pull request #379 from test-kitchen/vagrant_winrm_unecessary
Browse files Browse the repository at this point in the history
Newest vagrant no long requires vagrant-winrm plugin
  • Loading branch information
tyler-ball authored Oct 26, 2018
2 parents cdf410c + 9153d87 commit 7e85526
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions lib/kitchen/driver/vagrant.rb
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,13 @@ def verify_winrm_plugin
" Please upgrade to version 1.6 or higher from #{WEBSITE}."
end

if !winrm_plugin_installed?
raise UserError, "WinRM Transport requires the vagrant-winrm " \
"Vagrant plugin to properly communicate with this Vagrant VM. " \
"Please install this plugin with: " \
"`vagrant plugin install vagrant-winrm' and try again."
if Gem::Version.new(vagrant_version) < Gem::Version.new("2.2.0") && !winrm_plugin_installed?
raise UserError, "Vagrant version #{vagrant_version} requires the " \
"vagrant-winrm plugin to properly communicate with this Vagrant VM " \
"over WinRM Transport. Please install this plugin with: " \
"`vagrant plugin install vagrant-winrm' and try again." \
"Alternatively upgrade to Vagrant >= 2.2.0 which does not " \
"require the vagrant-winrm plugin."
end
end

Expand Down

0 comments on commit 7e85526

Please sign in to comment.