[DRE-commits] [vagrant-libvirt] 60/104: close #43 key file set in provider url

[Antonio Terceiro]

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

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

commit ba235915b34c2be2ffdcfc7bdf2a986fe46d68ff
Author: dima <pronix.service at gmail.com>
Date:   Thu Aug 15 02:01:08 2013 +0200

    close #43 key file set in provider url
---
 lib/vagrant-libvirt/action/connect_libvirt.rb | 6 +++++-
 lib/vagrant-libvirt/action/read_ssh_info.rb   | 7 ++++---
 lib/vagrant-libvirt/provider.rb               | 4 ++--
 vagrant-libvirt.gemspec                       | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/vagrant-libvirt/action/connect_libvirt.rb b/lib/vagrant-libvirt/action/connect_libvirt.rb
index aab1d06..cf2d6cf 100644
--- a/lib/vagrant-libvirt/action/connect_libvirt.rb
+++ b/lib/vagrant-libvirt/action/connect_libvirt.rb
@@ -6,7 +6,7 @@ module VagrantPlugins
     module Action
       class ConnectLibvirt
         def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::connect_libvirt")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::connect_libvirt')
           @app = app
         end
 
@@ -39,7 +39,11 @@ module VagrantPlugins
             uri << '://'
             uri << config.host if config.host
           end
+
           uri << '/system?no_verify=1'
+          # set ssh key for access to libvirt host
+          home_dir = `echo ${HOME}`.chomp
+          uri << "&keyfile=#{home_dir}/.ssh/id_rsa"
 
           conn_attr = {}
           conn_attr[:provider] = 'libvirt'
diff --git a/lib/vagrant-libvirt/action/read_ssh_info.rb b/lib/vagrant-libvirt/action/read_ssh_info.rb
index 83edbb7..7899bbf 100644
--- a/lib/vagrant-libvirt/action/read_ssh_info.rb
+++ b/lib/vagrant-libvirt/action/read_ssh_info.rb
@@ -12,8 +12,8 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(
-            env[:libvirt_compute], env[:machine])
+          env[:machine_ssh_info] = read_ssh_info(env[:libvirt_compute],
+                                                 env[:machine])
 
           @app.call(env)
         end
@@ -34,6 +34,7 @@ module VagrantPlugins
           ip_address = nil
           domain.wait_for(2) {
             addresses.each_pair do |type, ip|
+              puts ip
               ip_address = ip[0] if ip[0] != nil
             end
             ip_address != nil
@@ -53,7 +54,7 @@ module VagrantPlugins
           end
 
           ssh_info
-        end 
+        end
       end
     end
   end
diff --git a/lib/vagrant-libvirt/provider.rb b/lib/vagrant-libvirt/provider.rb
index bb9eb27..dc78434 100644
--- a/lib/vagrant-libvirt/provider.rb
+++ b/lib/vagrant-libvirt/provider.rb
@@ -45,7 +45,7 @@ module VagrantPlugins
         #  :username => "mitchellh",
         #  :private_key_path => "/path/to/my/key"
         #}
-        env = @machine.action("read_ssh_info")
+        env = @machine.action('read_ssh_info')
         env[:machine_ssh_info]
       end
 
@@ -55,7 +55,7 @@ module VagrantPlugins
         # Run a custom action we define called "read_state" which does
         # what it says. It puts the state in the `:machine_state_id`
         # key in the environment.
-        env = @machine.action("read_state")
+        env = @machine.action('read_state')
 
         state_id = env[:machine_state_id]
 
diff --git a/vagrant-libvirt.gemspec b/vagrant-libvirt.gemspec
index 311906d..247c429 100644
--- a/vagrant-libvirt.gemspec
+++ b/vagrant-libvirt.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantPlugins::ProviderLibvirt::VERSION
 
-  gem.add_runtime_dependency "fog", "~> 1.10.0"
+  gem.add_runtime_dependency "fog", "1.10.0"
   gem.add_runtime_dependency "ruby-libvirt", "~> 0.4.0"
 
   gem.add_development_dependency "rake"

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