chef-metal-fog 0.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1fdb71aedeacd1389f9b204d2518a566cd129f8
-  data.tar.gz: 06a458753dad712619205ad5cccee51c8cbd00c3
+  metadata.gz: b5883afe070478a843245ccc9844ea0f355e9596
+  data.tar.gz: f3ea03361d9501d0860e32eadfbad2a0408164dc
 SHA512:
-  metadata.gz: a3b39d661695873096fd28868f735e8d73266cc19b08e5ab646a092e0a8cee2dceebe4ab09aaf9c4f4de04248dafd42fc9bc5eba34d172480a2d5aec37e53329
-  data.tar.gz: 1e0f3e6766d5aa9da0b38a2f8e236764bea3de9b68c54b4d70d13188e29ef4da2f5dcf47e11ac0b6e863aea7478b7d598a154341cf758f271f062c1368e5f563
+  metadata.gz: 580d1fc60224a67c4962f76c208ffa1691fb0b82b882e01769d624a066237fb2f4a413afb0591ca9562883373fe22dde212ebfd861374b772d63f031e7b12d3d
+  data.tar.gz: 83f6827b9ead2253391d5a409c32a869e40e2d4d31ab36cba8880f338e6ccac5149a14cd8732bd3129f08de1006d15ee4850b76d9a027f0ac9244a7e059b797c

data/lib/chef_metal_fog/fog_driver.rb

@@ -497,17 +497,25 @@ module ChefMetalFog
       }.merge(machine_options[:ssh_options] || {})
       if server.respond_to?(:private_key) && server.private_key
         result[:key_data] = [ server.private_key ]
-      elsif server.respond_to?(:key_name)
-        result[:key_data] = [ get_private_key(server.key_name) ]
+      elsif server.respond_to?(:key_name) && server.key_name
+        key = get_private_key(server.key_name)
+        if !key
+          raise "Server has key name '#{server.key_name}', but the corresponding private key was not found locally.  Check if the key is in Chef::Config.private_key_paths: #{Chef::Config.private_key_paths.join(', ')}"
+        end
+        result[:key_data] = [ key ]
       elsif machine_spec.location['key_name']
-        result[:key_data] = [ get_private_key(machine_spec.location['key_name']) ]
+        key = get_private_key(machine_spec.location['key_name'])
+        if !key
+          raise "Server was created with key name '#{machine_spec.location['key_name']}', but the corresponding private key was not found locally.  Check if the key is in Chef::Config.private_key_paths: #{Chef::Config.private_key_paths.join(', ')}"
+        end
+        result[:key_data] = [ key ]
       elsif machine_options[:bootstrap_options][:key_path]
         result[:key_data] = [ IO.read(machine_options[:bootstrap_options][:key_path]) ]
       elsif machine_options[:bootstrap_options][:key_name]
         result[:key_data] = [ get_private_key(machine_options[:bootstrap_options][:key_name]) ]
       else
         # TODO make a way to suggest other keys to try ...
-        raise "No key found to connect to #{machine_spec.name}!"
+        raise "No key found to connect to #{machine_spec.name} (#{machine_spec.location.inspect})!"
       end
       result
     end

data/lib/chef_metal_fog/providers/aws.rb

@@ -23,7 +23,7 @@ module ChefMetalFog
       def bootstrap_options_for(action_handler, machine_spec, machine_options)
         bootstrap_options = symbolize_keys(machine_options[:bootstrap_options] || {})
 
-        unless !bootstrap_options[:key_name]
+        if !bootstrap_options[:key_name]
           bootstrap_options[:key_name] = overwrite_default_key_willy_nilly(action_handler)
         end
 

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.6'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
 platform: ruby
 authors:
 - John Keiser