chef-metal-fog 0.5.beta → 0.5.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd0fd9efc928a98ed0742916d1bbbed1a2c13b3
-  data.tar.gz: a4cb6fb64e7848db44f96ef6e4385bcd1fe1247d
+  metadata.gz: fdf92586a21978285397db7d6e107f393f497f3b
+  data.tar.gz: 9d46beeeae6d982ffa36b185679195e7e97db8c5
 SHA512:
-  metadata.gz: 872bbb650218e9374713b63575849a25eb5dc296b0633ace402c5c19b791a5e8f68115df0546eb5297e87d586f5d3f24c22fc1c1b592784a95221358a70bf100
-  data.tar.gz: 9455469c78c3d131ef9562cea69bb6a529dafa4f98f2f3bd8541012b66bddc2db08cbbbcf83a5266f1e72925c10ddaafde8f43f3a0dab5ada29c39301fb43ee6
+  metadata.gz: 662546f7745a1ec9a914951b6534a61b560c5d4b927e48705ad1cbeff229d8334bc1c8e74d0c0bb2f56436c6e51d671158cae49565cf40bc0b223aaf56d8feea
+  data.tar.gz: 1f9a2e09eea5a1c48e7d14f9b8b10ed4931315a713d66d03a60fea187c12003b24e5df41f08d4efe4e2252b655cf32b968fe64fab47505cc4a58954e682f30ab

data/lib/chef/provider/fog_key_pair.rb

@@ -51,11 +51,11 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         ensure_keys(action)
       end
 
-      new_fingerprints = case new_driver.compute_options[:provider]
+      case new_driver.compute_options[:provider]
       when 'DigitalOcean'
-        [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
       when 'OpenStack'
-        [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
       else
         # “The nice thing about standards is that you have so many to
         # choose from.” - Andrew S. Tanenbaum
@@ -68,12 +68,14 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         #
         # So compute both possible AWS fingerprints and check if either of
         # them matches.
-        [Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint),
-         lambda { Cheffish::KeyFormatter.encode(desired_private_key,
-                                       :format => :pkcs8sha1fingerprint) }]
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)]
+        if RUBY_VERSION.to_f < 2.0
+          new_fingerprints << lambda { Cheffish::KeyFormatter.encode(desired_private_key,
+                                         :format => :pkcs8sha1fingerprint) }
+        end
       end
 
-      if !new_fingerprints.any? { |f| (f.is_a?(Proc) ? f.call : f) == @current_fingerprint }
+      if !new_fingerprints.any? { |f| f == @current_fingerprint }
         if new_resource.allow_overwrite
           converge_by "update #{key_description} to match local key at #{new_resource.private_key_path}" do
             case new_driver.compute_options[:provider]
@@ -82,6 +84,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
             when 'OpenStack'
               compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
             else
+              compute.key_pairs.get(new_resource.name).destroy
               compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
             end
           end

data/lib/chef_metal_fog/fog_driver.rb

@@ -366,7 +366,10 @@ module ChefMetalFog
     end
 
     def symbolize_keys(options)
-      options.inject({}) { |result,(key,value)| result[key.to_sym] = value; result }
+      options.inject({}) do |result,(key,value)|
+        result[key.to_sym] = value
+        result
+      end
     end
 
     def server_for(machine_spec)
@@ -540,7 +543,7 @@ module ChefMetalFog
           raise "unsupported fog provider #{provider}"
         end
       elsif provider == 'AWS'
-        id = 'default'
+        driver_options[:aws_profile] = 'default'
       end
 
       # Set auth info from environment
@@ -578,45 +581,5 @@ module ChefMetalFog
 
       [ config, id ]
     end
-
-    def get_default_private_key
-      if config[:private_keys] && config[:private_keys].size > 0
-        get_private_key(config[:private_keys].keys.first)
-      else
-        config[:private_key_paths].each do |private_key_path|
-          Dir.entries(private_key_path).each do |key|
-            ext = File.extname(key)
-            if ext == '' || ext == '.pem'
-              key_name = key[0..-(ext.length+1)]
-              if key_name == name
-                return IO.read("#{private_key_path}/#{key}")
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def get_private_key(name)
-      if config[:private_keys] && config[:private_keys][name]
-        if config[:private_keys][name].is_a?(String)
-          IO.read(config[:private_keys][name])
-        else
-          config[:private_keys][name].to_pem
-        end
-      elsif config[:private_key_paths]
-        config[:private_key_paths].each do |private_key_path|
-          Dir.entries(private_key_path).each do |key|
-            ext = File.extname(key)
-            if ext == '' || ext == '.pem'
-              key_name = key[0..-(ext.length+1)]
-              if key_name == name
-                return IO.read("#{private_key_path}/#{key}")
-              end
-            end
-          end
-        end
-      end
-    end
   end
 end

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.5.beta'
+  VERSION = '0.5.beta.2'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.5.beta
+  version: 0.5.beta.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Driver for creating Fog instances in Chef Metal.
@@ -88,18 +88,18 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- Rakefile
 - LICENSE
 - README.md
+- Rakefile
 - lib/chef/provider/fog_key_pair.rb
 - lib/chef/resource/fog_key_pair.rb
 - lib/chef_metal/driver_init/fog.rb
+- lib/chef_metal_fog.rb
 - lib/chef_metal_fog/aws_credentials.rb
 - lib/chef_metal_fog/fog_driver.rb
 - lib/chef_metal_fog/fog_driver_aws.rb
 - lib/chef_metal_fog/recipe_dsl.rb
 - lib/chef_metal_fog/version.rb
-- lib/chef_metal_fog.rb
 homepage: https://github.com/opscode/chef-metal-fog
 licenses: []
 metadata: {}
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Driver for creating Fog instances in Chef Metal.