libvirtinator 0.1.4 → 0.1.5

data/lib/libvirtinator/examples/config/deploy.rb

@@ -66,4 +66,5 @@ set :data_disk_vg_path,     -> { fetch("#{fetch(:host_machine_name)}_data_disk_v
 set :data_disk_lv_name,     -> { "#{fetch(:node_name)}-data" }
 set :data_disk_lv_path,     -> { "#{fetch(:data_disk_vg_path)}/#{fetch(:data_disk_lv_name)}" }
 set :data_disk_qemu_path,   -> { "#{fetch(:root_partitions_path)}/#{fetch(:node_name)}-data.qcow2" }
+set :private_key_path,      -> { "temp_key_#{fetch(:stage)}" }
 

data/lib/libvirtinator/users.rb

@@ -1,9 +1,10 @@
 namespace :users do
 
   task :load_settings => 'libvirtinator:load_settings' do
-    if fetch(:private_key_path).nil?
+    if File.exists? fetch(:private_key_path)
       SSHKit::Backend::Netssh.configure do |ssh|
         ssh.ssh_options = {
+          keys: fetch(:private_key_path),
           forward_agent: false,
           auth_methods: %w(publickey)
         }
@@ -11,7 +12,6 @@ namespace :users do
     else
       SSHKit::Backend::Netssh.configure do |ssh|
         ssh.ssh_options = {
-          keys: fetch(:private_key_path),
           forward_agent: false,
           auth_methods: %w(publickey)
         }
@@ -71,7 +71,7 @@ namespace :users do
           end
         end
       run_locally do
-        unless fetch(:private_key_path).nil?
+        if File.exists? fetch(:private_key_path)
           execute "rm", "-f", "#{fetch(:private_key_path)}*"
         end
       end

data/lib/libvirtinator/vm.rb

@@ -241,13 +241,11 @@ task :update_root_image => 'libvirtinator:load_settings' do
         execute "chroot", mount_point, "/bin/bash", "-c",
           "\"chown", "#{user}:#{user}", "/home/#{user}", "/home/#{user}/.ssh\""
         execute "chmod", "700", "#{mount_point}/home/#{user}/.ssh"
-        key_name = "temp_key_#{fetch(:stage)}"
-        set :private_key_path, key_name
         run_locally do
-          execute "rm", "-f", key_name
-          execute "ssh-keygen", "-P", "''", "-f", key_name
+          execute "rm", "-f", fetch(:private_key_path)
+          execute "ssh-keygen", "-P", "''", "-f", fetch(:private_key_path)
         end
-        upload! File.open("#{key_name}.pub"), "/tmp/pubkeys"
+        upload! File.open("#{fetch(:private_key_path)}.pub"), "/tmp/pubkeys"
         execute "mv", "/tmp/pubkeys", "#{mount_point}/home/#{user}/.ssh/authorized_keys"
         execute "chroot", mount_point, "/bin/bash", "-c",
           "\"chown", "#{user}:#{user}", "/home/#{user}/.ssh/authorized_keys\""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libvirtinator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.1
 description: An Opinionated libvirt VM Deployment gem
 email: davidamick@ctisolutionsinc.com
 executables: []
@@ -78,3 +94,4 @@ signing_key:
 specification_version: 3
 summary: Deploy libvirt VMs
 test_files: []
+has_rdoc: