[DRE-commits] [vagrant-libvirt] 52/163: Provider does not need to set username

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.26
in repository vagrant-libvirt.

commit e693e82ed2fbbc64d1020cd367e02f912d06fc95
Author: Brian Pitts <brian at polibyte.com>
Date:   Sun Sep 28 14:49:37 2014 -0500

    Provider does not need to set username
    
    If the user sets this themselves, vagrant will pick it up. If the user
    does not set it, vagrant will set a default. All this works without any
    code on our end.
---
 lib/vagrant-libvirt/action/read_ssh_info.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/vagrant-libvirt/action/read_ssh_info.rb b/lib/vagrant-libvirt/action/read_ssh_info.rb
index 6d324bc..01e32a7 100644
--- a/lib/vagrant-libvirt/action/read_ssh_info.rb
+++ b/lib/vagrant-libvirt/action/read_ssh_info.rb
@@ -43,17 +43,12 @@ module VagrantPlugins
           ssh_info = {
             :host          => ip_address,
             :port          => machine.config.ssh.guest_port,
-            :username      => machine.config.ssh.username,
             :forward_agent => machine.config.ssh.forward_agent,
             :forward_x11   => machine.config.ssh.forward_x11,
           }
           
           ssh_info[:proxy_command] = "ssh '#{machine.provider_config.host}' -l '#{machine.provider_config.username}' nc %h %p" if machine.provider_config.connect_via_ssh
 
-          if not ssh_info[:username]
-            ssh_info[:username] = machine.config.ssh.default.username
-          end
-
           ssh_info
         end
       end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git