chef-metal-fog 0.7.1 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55ddb8af472d71de01c6206ec99c8373a3472bb
-  data.tar.gz: 8dbd7d62d6a31fb4f2e4d03a3790ce8cb859c9ec
+  metadata.gz: 2278f6624a0634e205da58bcc1e966b22eab39cf
+  data.tar.gz: a1f4213a340ec309ef22d4fa141262f367e379d0
 SHA512:
-  metadata.gz: c3fd1d83614f27f4c452a3db315f4ddbd2e56771953af3fa0b05e5e9550643a9f27e0fa3ff0fe6c8cfa626922c37f43afde9a1b9d1be2f05d50d070f1c999b2e
-  data.tar.gz: 45c301339fca7a8296288daeb4c69797a1d5ae7a346496b429da0f74f6bfd7186861be99889aa330db218f907833943f98e0228ef000c9ac1a004cc8c8f6f496
+  metadata.gz: dd9e876567aaf22364a1e12efd5747464ecea0722e9758a5866feb4bb0877d3fd4a9bdc7799aa31b18c67c79c4c5b1fdc517e550812b9ea8fda7315feaaef050
+  data.tar.gz: 9a4b72747673099393f9571bc81492b951c901e6b5773a6cb2d6918fa0dfc17f14b7ca03e078d673660dbc72ea7bec6b3a4f84da0833563f3c3b88640ea70db5

data/lib/chef/provider/fog_key_pair.rb

@@ -19,6 +19,8 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         case new_driver.compute_options[:provider]
         when 'DigitalOcean'
           compute.destroy_key_pair(@current_id)
+        when 'Joyent'
+          compute.delete_key(@current_id)
         when 'OpenStack', 'Rackspace'
           compute.key_pairs.destroy(@current_id)
         else
@@ -56,6 +58,8 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       case new_driver.compute_options[:provider]
       when 'DigitalOcean'
         new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
+      when 'Joyent'
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :rfc4716md5fingerprint)]
       when 'OpenStack', 'Rackspace'
         new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
       else
@@ -94,6 +98,8 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
             case new_driver.compute_options[:provider]
             when 'DigitalOcean'
               compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            when 'Joyent'
+              compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
             when 'OpenStack'
               compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
             when 'Rackspace'
@@ -116,6 +122,8 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         case new_driver.compute_options[:provider]
         when 'DigitalOcean'
           compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        when 'Joyent'
+          compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
         when 'OpenStack'
           compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
         when 'Rackspace'
@@ -212,6 +220,25 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
       else
         current_resource.action :delete
       end
+    when 'Joyent'
+      current_key_pair = begin
+        compute.keys.get(new_resource.name)
+      rescue Fog::Compute::Joyent::Errors::NotFound
+        nil
+      end
+      if current_key_pair
+        @current_id = current_key_pair.name
+        @current_fingerprint = if current_key_pair.respond_to?(:fingerprint)
+          current_key_pair.fingerprint
+        elsif current_key_pair.respond_to?(:key)
+          public_key, format = Cheffish::KeyFormatter.decode(current_key_pair.key)
+          public_key.fingerprint
+        else
+          nil
+        end
+      else
+        current_resource.action :delete
+      end
     when 'OpenStack', 'Rackspace'
       current_key_pair = compute.key_pairs.get(new_resource.name)
       if current_key_pair

data/lib/chef_metal_fog/fog_driver.rb

@@ -244,6 +244,10 @@ module ChefMetalFog
       end
     end
 
+    def image_for(image_spec)
+      compute.images.get(image_spec.location['image_id'])
+    end
+
     def compute
       @compute ||= Fog::Compute.new(compute_options)
     end

data/lib/chef_metal_fog/providers/aws.rb

@@ -1,5 +1,6 @@
 require 'chef/log'
 require 'fog/aws'
+require 'uri'
 
 #   fog:AWS:<account_id>:<region>
 #   fog:AWS:<profile_name>
@@ -20,6 +21,64 @@ module ChefMetalFog
         'ubuntu'
       end
 
+      def allocate_image(action_handler, image_spec, image_options, machine_spec)
+        if image_spec.location
+          image = compute.images.get(image_spec.location['image_id'])
+          if image
+            raise "The image already exists, why are you asking me to create it?  I can't do that, Dave."
+          end
+        end
+        action_handler.perform_action "Create image #{image_spec.name} from machine #{machine_spec.name} with options #{image_options.inspect}" do
+          opt = image_options.dup
+          response = compute.create_image(machine_spec.location['server_id'],
+                                       image_spec.name,
+                                       opt.delete(:description) || "The image formerly and currently named '#{image_spec.name}'",
+                                       opt.delete(:no_reboot) || false,
+                                       opt)
+          image_spec.location = {
+            'driver_url' => driver_url,
+            'driver_version' => ChefMetalFog::VERSION,
+            'image_id' => response.body['imageId'],
+            'creator' => creator,
+            'allocated_at' => Time.now.to_i
+          }
+
+          image_spec.machine_options ||= {}
+          image_spec.machine_options.merge!({
+            :bootstrap_options => {
+                :image_id => image_spec.location['image_id']
+            }
+          })
+
+        end
+      end
+
+      def ready_image(action_handler, image_spec, image_options)
+        if !image_spec.location
+          raise "Cannot ready an image that does not exist"
+        end
+        image = compute.images.get(image_spec.location['image_id'])
+        if !image.ready?
+          action_handler.report_progress "Waiting for image to be ready ..."
+          # TODO timeout
+          image.wait_for { ready? }
+          action_handler.report_progress "Image is ready!"
+        end
+      end
+
+      def destroy_image(action_handler, image_spec, image_options)
+        if !image_spec.location
+          return
+        end
+        image = compute.images.get(image_spec.location['image_id'])
+        if !image
+          return
+        end
+        delete_snapshots = image_options[:delete_snapshots]
+        delete_snapshots = true if delete_snapshots.nil?
+        image.deregister(delete_snapshots)
+      end
+
       def bootstrap_options_for(action_handler, machine_spec, machine_options)
         bootstrap_options = symbolize_keys(machine_options[:bootstrap_options] || {})
 
@@ -45,7 +104,7 @@ module ChefMetalFog
           if extra_tags.size > 0 || different_tags.size > 0
             tags_description = [ "Update tags for #{machine_spec.name} on #{driver_url}" ]
             tags_description += extra_tags.map { |tag| "  Add #{tag} = #{tags[tag].inspect}" }
-            tags_description += different_tags.map { |tag| "  Update #{tag.name} from #{tag.value.inspect} to #{tags[tag.name].inspect}"}
+            tags_description += different_tags.map { |tag_name, tag_value| "  Update #{tag_name} from #{tag_value.inspect} to #{tags[tag_name].inspect}"}
             action_handler.perform_action tags_description do
               # TODO should we narrow this down to just extra/different tags or
               # is it OK to just pass 'em all?  Certainly easier to do the
@@ -56,6 +115,11 @@ module ChefMetalFog
         end
       end
 
+      def convergence_strategy_for(machine_spec, machine_options)
+        machine_options[:convergence_options][:ohai_hints] = { 'ec2' => ''}
+        super(machine_spec, machine_options)
+      end
+
       def self.get_aws_profile(driver_options, aws_account_id)
         aws_credentials = get_aws_credentials(driver_options)
         compute_options = driver_options[:compute_options] || {}
@@ -78,11 +142,11 @@ module ChefMetalFog
           elsif driver_options[:aws_profile]
             Chef::Log.debug("Using AWS profile #{driver_options[:aws_profile]}")
             aws_credentials[driver_options[:aws_profile]]
-          elsif ENV['AWS_ACCESS_KEY_ID']
+          elsif ENV['AWS_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY']
             Chef::Log.debug("Using AWS environment variable access keys")
             {
-              :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-              :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
+              :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'] || ENV['AWS_ACCESS_KEY'],
+              :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_KEY'],
               :aws_security_token => ENV['AWS_SECURITY_TOKEN'],
               :region => ENV['AWS_REGION']
             }
@@ -93,6 +157,19 @@ module ChefMetalFog
             Chef::Log.debug("Using AWS default profile")
             aws_credentials.default
           end
+        # Endpoint configuration
+        if compute_options[:ec2_endpoint]
+          aws_profile[:ec2_endpoint] = compute_options[:ec2_endpoint]
+        elsif ENV['EC2_URL']
+          aws_profile[:ec2_endpoint] = ENV['EC2_URL']
+        end
+        if compute_options[:iam_endpoint]
+          aws_profile[:iam_endpoint] = compute_options[:iam_endpoint]
+        elsif ENV['AWS_IAM_URL']
+          aws_profile[:iam_endpoint] = ENV['AWS_IAM_URL']
+        else
+          aws_profile[:iam_endpoint] = "https://iam.amazonaws.com/"
+        end
 
         # Merge in account info for profile
         if aws_profile
@@ -144,7 +221,11 @@ module ChefMetalFog
           options = {
             :aws_access_key_id => aws_profile[:aws_access_key_id],
             :aws_secret_access_key => aws_profile[:aws_secret_access_key],
-            :aws_session_token => aws_profile[:aws_security_token]
+            :aws_session_token => aws_profile[:aws_security_token],
+            :host => URI(aws_profile[:iam_endpoint]).host,
+            :scheme => URI(aws_profile[:iam_endpoint]).scheme,
+            :port => URI(aws_profile[:iam_endpoint]).port,
+            :path => URI(aws_profile[:iam_endpoint]).path
           }
           options.delete_if { |key, value| value.nil? }
 
@@ -224,6 +305,7 @@ module ChefMetalFog
         new_compute_options[:aws_secret_access_key] = aws_profile[:aws_secret_access_key]
         new_compute_options[:aws_session_token] = aws_profile[:aws_security_token]
         new_defaults[:driver_options][:compute_options][:region] = aws_profile[:region]
+        new_defaults[:driver_options][:compute_options][:endpoint] = aws_profile[:ec2_endpoint]
 
         account_info = aws_account_info_for(result[:driver_options][:compute_options])
         new_config[:driver_options][:aws_account_info] = account_info

data/lib/chef_metal_fog/providers/joyent.rb

@@ -0,0 +1,55 @@
+require 'fog/joyent'
+
+#   fog:Joyent:<joyent_url>
+module ChefMetalFog
+  module Providers
+    class Joyent < ChefMetalFog::FogDriver
+
+      ChefMetalFog::FogDriver.register_provider_class('Joyent', ChefMetalFog::Providers::Joyent)
+
+      def creator
+        compute_options[:joyent_username]
+      end
+
+      def bootstrap_options_for(action_handler, machine_spec, machine_options)
+        bootstrap_options = symbolize_keys(machine_options[:bootstrap_options] || {})
+
+        bootstrap_options[:tags] = default_tags(machine_spec, bootstrap_options[:tags] || {})
+
+        bootstrap_options[:tags].each do |key, val|
+          bootstrap_options["tag.#{key}"] = val
+        end
+
+        bootstrap_options[:name] ||= machine_spec.name
+
+        bootstrap_options
+      end
+
+      def self.compute_options_for(provider, id, config)
+        new_compute_options = {}
+        new_compute_options[:provider] = provider
+        new_config = { :driver_options => { :compute_options => new_compute_options }}
+        new_defaults = {
+          :driver_options => { :compute_options => {} },
+          :machine_options => { :bootstrap_options => {} }
+        }
+        result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
+
+        new_compute_options[:joyent_url] = id if (id && id != '')
+        credential = Fog.credentials
+
+        new_compute_options[:joyent_username] ||= credential[:joyent_username]
+        new_compute_options[:joyent_password] ||= credential[:joyent_password]
+        new_compute_options[:joyent_keyname] ||= credential[:joyent_keyname]
+        new_compute_options[:joyent_keyfile] ||= credential[:joyent_keyfile]
+        new_compute_options[:joyent_url] ||= credential[:joyent_url]
+        new_compute_options[:joyent_version] ||= credential[:joyent_version]
+
+        id = result[:driver_options][:compute_options][:joyent_url]
+
+        [result, id]
+      end
+
+    end
+  end
+end

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.7.1'
+  VERSION = '0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: '0.8'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -114,6 +114,7 @@ files:
 - lib/chef_metal_fog/providers/aws/credentials.rb
 - lib/chef_metal_fog/providers/cloudstack.rb
 - lib/chef_metal_fog/providers/digitalocean.rb
+- lib/chef_metal_fog/providers/joyent.rb
 - lib/chef_metal_fog/providers/openstack.rb
 - lib/chef_metal_fog/providers/rackspace.rb
 - lib/chef_metal_fog/recipe_dsl.rb