chef-metal-fog 0.3.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f2915e316f74e59429cd54e1fb1b2d044fbf5a
-  data.tar.gz: e924f144a8f16bef3ef44381314c782fe8bd1d27
+  metadata.gz: 60b1659681a87e03c3e75748bf5e0a729d1d42e0
+  data.tar.gz: 7aea9de39a52c044f12f49b045bb9bad64277851
 SHA512:
-  metadata.gz: f07cef0c5c334a9a709f996d827200d9839cb1457373bf84c974a72d6657420e12085c7ab0050b16e718728285ee6048a54079bfab3eb8b4ed4b0185c400da23
-  data.tar.gz: 1657897320549abd7bd226d078b086b75592f1559fb7959397c84f9df5a89f0b96247c79754c29fb761648daaf5aba1a7a71e96185f9ed8b8ec385540406dc22
+  metadata.gz: 6528c4091d92999bf66166df4459cd036b273c65e8372cda122a35c5efbaf0a1bc2d12fa624ef2935545b05cf1c86473ca44b535a5c837a17ac1f09f24d8f6d4
+  data.tar.gz: 64d79d629752c5c3da14a5dfbb9a91a4a96f62bd956ecaacdd8adde30a24e4d040213ae13f06b793065e077c3df7e55aec472d5e0419dd8e4bb7fb39344610bc

data/lib/chef/provider/fog_key_pair.rb

@@ -13,7 +13,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
   end
 
   action :create do
-    create_key
+    create_key(:create)
   end
 
   action :delete do
@@ -35,29 +35,42 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
     "#{new_resource.name} on #{new_resource.provisioner.provisioner_url}"
   end
 
-  def create_key
+  def create_key(action)
     if current_resource_exists?
       # If the public keys are different, update the server public key
       if !current_resource.private_key_path
         if new_resource.allow_overwrite
-          ensure_keys
+          ensure_keys(action)
         else
           raise "#{key_description} already exists on the server, but the private key #{new_resource.private_key_path} does not exist!"
         end
       else
-        ensure_keys
+        ensure_keys(action)
       end
 
-      new_fingerprint = case new_resource.provisioner.compute_options[:provider]
+      new_fingerprints = case new_resource.provisioner.compute_options[:provider]
       when 'DigitalOcean'
-        Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)
+        [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
       when 'OpenStack'
-        Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)
+        [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
       else
-        Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)
+        # “The nice thing about standards is that you have so many to
+        # choose from.” - Andrew S. Tanenbaum
+        #
+        # The AWS EC2 API uses a PKCS#1 MD5 fingerprint for keys that you
+        # import into EC2, but a PKCS#8 SHA1 fingerprint for keys that you
+        # generate using its web console. Both fingerprints are different
+        # from the familiar RFC4716 MD5 fingerprint that OpenSSH displays
+        # for host keys.
+        #
+        # 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) }]
       end
 
-      if new_fingerprint != @current_fingerprint
+      if !new_fingerprints.any? { |f| (f.is_a?(Proc) ? f.call : 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_resource.provisioner.compute_options[:provider]
@@ -70,12 +83,12 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
             end
           end
         else
-          raise "#{key_description} does not match local private key, and allow_overwrite is false!"
+          raise "#{key_description} with fingerprint #{@current_fingerprint} does not match local key fingerprint(s) #{new_fingerprints}, and allow_overwrite is false!"
         end
       end
     else
       # Generate the private and/or public keys if they do not exist
-      ensure_keys
+      ensure_keys(action)
 
       # Create key
       converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
@@ -91,9 +104,9 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
     end
   end
 
-  def ensure_keys
+  def ensure_keys(action)
     resource = new_resource
-    Cheffish.inline_resource(self) do
+    Cheffish.inline_resource(self, action) do
       private_key resource.private_key_path do
         public_key_path resource.public_key_path
         if resource.private_key_options
@@ -111,12 +124,18 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         public_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.public_key_path))
         public_key
       else
-        private_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.private_key_path))
-        private_key.public_key
+        desired_private_key.public_key
       end
     end
   end
 
+  def desired_private_key
+    @desired_private_key ||= begin
+        private_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.private_key_path))
+        private_key
+    end
+  end
+
   def current_resource_exists?
     @current_resource.action != [ :delete ]
   end
@@ -133,7 +152,7 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
     if !new_resource.provisioner.kind_of?(ChefMetalFog::FogProvisioner)
       raise 'ec2_key_pair only works with fog_provisioner'
     end
-    @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name)
+    @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name, run_context)
     case new_resource.provisioner.compute_options[:provider]
     when 'DigitalOcean'
       current_key_pair = compute.ssh_keys.select { |key| key.name == new_resource.name }.first

data/lib/chef/resource/fog_key_pair.rb

@@ -5,7 +5,7 @@ class Chef::Resource::FogKeyPair < Chef::Resource::LWRPBase
 
   def initialize(*args)
     super
-    @provisioner = ChefMetal.enclosing_provisioner
+    @provisioner = run_context.chef_metal.current_provisioner
   end
 
   def after_created

data/lib/chef_metal_fog.rb

@@ -6,7 +6,7 @@ require 'chef_metal_fog/fog_provisioner'
 class Chef
   class Recipe
     def with_fog_provisioner(options = {}, &block)
-      ChefMetal.with_provisioner(ChefMetalFog::FogProvisioner.new(options), &block)
+      run_context.chef_metal.with_provisioner(ChefMetalFog::FogProvisioner.new(options), &block)
     end
 
     def with_fog_ec2_provisioner(options = {}, &block)

data/lib/chef_metal_fog/fog_provisioner.rb

@@ -154,10 +154,17 @@ module ChefMetalFog
     #
     def acquire_machine(action_handler, node)
       # Set up the modified node data
+      creator = case compute_options[:provider]
+        when 'AWS'
+          aws_login_info[1]
+        when 'OpenStack'
+          compute_options[:openstack_username]
+      end
+
       provisioner_output = node['normal']['provisioner_output'] || {
         'provisioner_url' => provisioner_url,
         'provisioner_version' => ChefMetalFog::VERSION,
-        'creator' => aws_login_info[1]
+        'creator' => creator
       }
 
       if provisioner_output['provisioner_url'] != provisioner_url
@@ -227,7 +234,7 @@ module ChefMetalFog
             Chef::Log.info 'Attaching given IP'
             server.wait_for { ready? }
             action_handler.perform_action "attach floating IP #{bootstrap_options[:floating_ip]}" do
-              attach_ip(server, bootstrap_options[:floating_ip])
+              attach_ip(server, bootstrap_options[:allocation_id], bootstrap_options[:floating_ip])
             end
           end
           action_handler.perform_action "machine #{node['name']} created as #{server.id} on #{provisioner_url}" do
@@ -294,10 +301,11 @@ module ChefMetalFog
     # Attach given IP to machine
     # Code taken from kitchen-openstack driver
     #    https://github.com/test-kitchen/kitchen-openstack/blob/master/lib/kitchen/driver/openstack.rb#L209-L213
-    def attach_ip(server, ip)
+    def attach_ip(server, allocation_id, ip)
       Chef::Log.info "Attaching floating IP <#{ip}>"
-      server.associate_address ip
-      (server.addresses['public'] ||= []) << { 'version' => 4, 'addr' => ip }
+      compute.associate_address(:instance_id => server.id,
+                                :allocation_id => allocation_id,
+                                :public_ip => ip)
     end
 
     # Connect to machine without acquiring it
@@ -308,8 +316,10 @@ module ChefMetalFog
     def delete_machine(action_handler, node)
       if node['normal']['provisioner_output'] && node['normal']['provisioner_output']['server_id']
         server = compute.servers.get(node['normal']['provisioner_output']['server_id'])
-        action_handler.perform_action "destroy machine #{node['name']} (#{node['normal']['provisioner_output']['server_id']} at #{provisioner_url})" do
-          server.destroy
+        if server
+          action_handler.perform_action "destroy machine #{node['name']} (#{node['normal']['provisioner_output']['server_id']} at #{provisioner_url})" do
+            server.destroy
+          end
         end
         convergence_strategy_for(node).cleanup_convergence(action_handler, node)
       end
@@ -487,7 +497,7 @@ module ChefMetalFog
         :host_key_alias => "#{server.id}.#{compute_options[:provider]}"
       }
       if server.respond_to?(:private_key) && server.private_key
-        result[:keys] = [ server.private_key ]
+        result[:key_data] = [ server.private_key ]
       elsif server.respond_to?(:key_name) && key_pairs[server.key_name]
         # TODO generalize for others?
         result[:keys] ||= [ key_pairs[server.key_name].private_key_path ]

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.3.1'
+  VERSION = '0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !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
@@ -83,7 +97,6 @@ files:
 - lib/chef_metal_fog/fog_provisioner.rb
 - lib/chef_metal_fog/version.rb
 - lib/chef_metal_fog.rb
-- lib/fog.rb
 homepage: https://github.com/opscode/chef-metal-fog
 licenses: []
 metadata: {}