ironfan 3.1.0.rc1

data/lib/ironfan/chef_layer.rb

@@ -0,0 +1,299 @@
+#
+# OK so things get a little fishy here, and it's all Opscode's fault ;-)
+#
+# There's currently no API for setting ACLs. However, if the *client the
+# node will run as* is the *client that creates the node*, it is granted the
+# correct permissions.
+#
+# * client exists, node exists: don't need to do anything. We trust that permissions are correct.
+# * client absent, node exists: client created, node is fine. We trust that permissions are correct.
+# * client absent, node absent: client created, so have key; client creates node, so it has write permissions.
+# * client exists, node absent: FAIL.
+#
+# The current implementation persists the client keys locally to your
+# Chef::Config[:client_key_dir].  This is insecure and unmanageable; and the
+# node will shortly re-register the key, making it invalide anyway.
+#
+# If the client's private_key is empty/wrong and the node is absent, it will
+# cause an error. in that case, you can:
+#
+# * create the node yourself in the management console, and
+#   grant access to its eponymous client; OR
+# * nuke the client key from orbit (it's the only way to be sure) and re-run,
+#   taking all responsibility for the catastrophic results of an errant nuke; OR
+# * wait for opscode to open API access for ACLs.
+#
+#
+
+module Ironfan
+  module DryRunnable
+    # Run given block unless in dry_run mode (Ironfan.chef_config[:dry_run]
+    # is true)
+    def unless_dry_run
+      if Ironfan.chef_config[:dry_run]
+        ui.info("      ... but not really (#{ui.color("dry run", :bold, :yellow)} for server #{name})")
+      else
+        yield
+      end
+    end
+  end
+
+  ComputeBuilder.class_eval do
+    def new_chef_role(role_name, cluster, facet=nil)
+      chef_role = Chef::Role.new
+      chef_role.name        role_name
+      chef_role.description "Ironfan generated role for #{[cluster_name, facet_name].compact.join('-')}" unless chef_role.description
+      chef_role.instance_eval{ @cluster = cluster; @facet = facet; }
+      @chef_roles << chef_role
+      chef_role
+    end
+  end
+
+  ServerSlice.class_eval do
+    include DryRunnable
+    def sync_roles
+      step("  syncing cluster and facet roles")
+      unless_dry_run do
+        chef_roles.each(&:save)
+      end
+    end
+  end
+
+  #
+  # Ironfan::Server methods that handle chef actions
+  #
+  Server.class_eval do
+    include DryRunnable
+
+    # The chef client, if it already exists in the server.
+    # Use the 'ensure' method to create/update it.
+    def chef_client
+      return @chef_client unless @chef_client.nil?
+      @chef_client = cluster.find_client(fullname) || false
+    end
+
+    # The chef node, if it already exists in the server.
+    # Use the 'ensure' method to create/update it.
+    def chef_node
+      return @chef_node unless @chef_node.nil?
+      @chef_node   = cluster.find_node(fullname) || false
+    end
+
+    # true if chef client is created and discovered
+    def chef_client?
+      chef_client.present?
+    end
+
+    # true if chef node is created and discovered
+    def chef_node?
+      chef_node.present?
+    end
+
+    def delete_chef
+      if chef_node   then
+        step("  deleting chef node", :red)
+        unless_dry_run do
+          chef_node.destroy
+        end
+        @chef_node   = nil
+      end
+      if chef_client
+        step("  deleting chef client", :red)
+        unless_dry_run do
+          chef_client.destroy
+        end
+        @chef_client = nil
+      end
+    end
+
+    # creates or updates the chef node.
+    #
+    # See notes at top of file for why all this jiggery-fuckery
+    #
+    # * client exists, node exists: assume client can update, weep later when
+    #   the initial chef run fails. Not much we can do here -- holler at opscode.
+    # * client exists, node absent: see if client can create, fail otherwise
+    # * client absent, node absent: see if client can create both, fail otherwise
+    # * client absent, node exists: fail (we can't get permissions)
+    def sync_chef_node
+      step("  syncing chef node using the server's key")
+      # force-fetch the node so that we have its full attributes (the discovery
+      # does not pull all of it back)
+      @chef_node = handle_chef_response('404'){ Chef::Node.load( fullname ) }
+      # sets @chef_client if it exists
+      chef_client
+      #
+      case
+      when    @chef_client  &&    @chef_node  then _update_chef_node # this will fail later if the chef client is in a bad state but whaddayagonnado
+      when    @chef_client  && (! @chef_node) then _create_chef_node
+      when (! @chef_client) && (! @chef_node) then # create both
+        ensure_chef_client
+        _create_chef_node
+      when (! @chef_client) &&    @chef_node
+        raise("The #{fullname} node exists, but its client does not.\nDue to limitations in the Opscode API, if we create a client, it will lack write permissions to the node. Small sadness now avoids much sadness later\nYou must either create a client manually, fix its permissions in the Chef console, and drop its client key where we can find it; or (if you are aware of the consequences) do \nknife node delete #{fullname}")
+      end
+      @chef_node
+    end
+
+    def client_key
+      @client_key ||= Ironfan::ChefClientKey.new("client-#{fullname}", chef_client) do |body|
+        chef_client.private_key(body) if chef_client.present? && body.present?
+        cloud.user_data(:client_key => body)
+      end
+    end
+
+    def chef_client_script_content
+      return @chef_client_script_content if @chef_client_script_content
+      return unless cloud.chef_client_script
+      script_filename = File.expand_path("../../config/#{cloud.chef_client_script}", File.dirname(__FILE__))
+      @chef_client_script_content = safely{ File.read(script_filename) }
+    end
+
+    def announce_state state
+      @chef_node.set[:state] = state
+    end
+
+  protected
+
+    # Create the chef client on the server. Do not call this directly -- go
+    # through sync_chef_node.
+    #
+    # this is done as the eponymous client, ensuring that the client does in
+    # fact have permissions on the node
+    #
+    # preconditions: @chef_node is set
+    def _create_chef_node(&block)
+      step("  creating chef node", :green)
+      @chef_node = Chef::Node.new
+      @chef_node.name(fullname)
+      set_chef_node_attributes
+      set_chef_node_environment
+      sync_volume_attributes
+      unless_dry_run do
+        chef_api_server_as_client.post_rest('nodes', @chef_node)
+      end
+    end
+
+    # Update the chef client on the server. Do not call this directly -- go
+    # through create_or_update_chef_node.
+    #
+    # this is done as the eponymous client, ensuring that the client does in
+    # fact have permissions on the node.
+    #
+    # preconditions: @chef_node is set
+    def _update_chef_node
+      step("  updating chef node", :blue)
+      set_chef_node_attributes
+      set_chef_node_environment
+      sync_volume_attributes
+      unless_dry_run do
+        chef_api_server_as_admin.put_rest("nodes/#{@chef_node.name}", @chef_node)
+      end
+    end
+
+
+    def sync_volume_attributes
+      composite_volumes.each do |vol_name, vol|
+        chef_node.normal[:volumes] ||= Mash.new
+        chef_node.normal[:volumes][vol_name] = vol.to_mash.compact
+      end
+    end
+
+    def set_chef_node_attributes
+      step("  setting node runlist and essential attributes")
+      @chef_node.run_list = Chef::RunList.new(*@settings[:run_list])
+      @chef_node.normal[  :organization] = Chef::Config[:organization] if Chef::Config[:organization]
+      @chef_node.override[:cluster_name] = cluster_name
+      @chef_node.override[:facet_name]   = facet_name
+      @chef_node.override[:facet_index]  = facet_index
+    end
+
+    def set_chef_node_environment
+      @chef_node.chef_environment(environment.to_s) if environment.present?
+    end
+
+    #
+    # Don't call this directly -- only through ensure_chef_node_and_client
+    #
+    def ensure_chef_client
+      step("  ensuring chef client exists")
+      return @chef_client if chef_client
+      step( "    creating chef client", :green)
+      @chef_client = Chef::ApiClient.new
+      @chef_client.name(fullname)
+      @chef_client.admin(false)
+      #
+      # ApiClient#create sends extra params that fail -- we'll do it ourselves
+      # purposefully *not* catching the 'but it already exists' error: if it
+      # didn't show up in the discovery process, we're in an inconsistent state
+      unless_dry_run do
+        response = chef_api_server_as_admin.post_rest("clients", { 'name' => fullname, 'admin' => false, 'private_key' => true })
+        client_key.body = response['private_key']
+      end
+      client_key.save
+      @chef_client
+    end
+
+    def chef_api_server_as_client
+      return @chef_api_server_as_client if @chef_api_server_as_client
+      unless File.exists?(client_key.filename)
+        raise("Cannot create chef node #{fullname} -- client #{@chef_client} exists but no client key found in #{client_key.filename}.")
+      end
+      @chef_api_server_as_client = Chef::REST.new(Chef::Config[:chef_server_url], fullname, client_key.filename)
+    end
+
+    def chef_api_server_as_admin
+      @chef_api_server_as_admin ||= Chef::REST.new(Chef::Config[:chef_server_url])
+    end
+
+    # Execute the given chef call, but don't explode if the given http status
+    # code comes back
+    #
+    # @return chef object, or false if the server returned a recoverable response
+    def handle_chef_response(recoverable_responses, &block)
+      begin
+        block.call
+      rescue Net::HTTPServerException => e
+        raise unless Array(recoverable_responses).include?(e.response.code)
+        Chef::Log.debug("Swallowing a #{e.response.code} response in #{self.fullname}: #{e}")
+        return false
+      end
+    end
+
+    #
+    # The below *was* present but was pulled from the API by opscode for some reason (2011/10/20)
+    #
+
+    # # The client is required to have these permissions on its eponymous node
+    # REQUIRED_PERMISSIONS = %w[read create update]
+    #
+    # #
+    # # Verify that the client has required _acl's on the node.
+    # #
+    # # We don't raise an error, just a very noisy warning.
+    # #
+    # def check_node_permissions
+    #   step("  ensuring chef node permissions are correct")
+    #   chef_server_rest = Chef::REST.new(Chef::Config[:chef_server_url])
+    #   handle_chef_response('404') do
+    #     perms = chef_server_rest.get_rest("nodes/#{fullname}/_acl")
+    #     perms_valid = {}
+    #     REQUIRED_PERMISSIONS.each{|perm| perms_valid[perm] = perms[perm] && perms[perm]['actors'].include?(fullname) }
+    #     Chef::Log.debug("Checking permissions: #{perms_valid.inspect} -- #{ perms_valid.values.all? ? 'correct' : 'BADNESS' }")
+    #     unless perms_valid.values.all?
+    #       ui.info(" ************************ ")
+    #       ui.info(" ")
+    #       ui.info(" INCONSISTENT PERMISSIONS for node #{fullname}:")
+    #       ui.info("   The client[#{fullname}] should have permissions for #{REQUIRED_PERMISSIONS.join(', ')}")
+    #       ui.info("   Instead, they are #{perms_valid.inspect}")
+    #       ui.info("   You should create the node #{fullname} as client[#{fullname}], not as yourself.")
+    #       ui.info(" ")
+    #       ui.info("   Please adjust the permissions on the Opscode console, at")
+    #       ui.info("     https://manage.opscode.com/nodes/#{fullname}/_acl")
+    #       ui.info(" ")
+    #       ui.info(" ************************ ")
+    #     end
+    #   end
+    # end
+  end
+end

data/lib/ironfan/cloud.rb

@@ -0,0 +1,412 @@
+module Ironfan
+  module Cloud
+
+    #
+    # Right now only one cloud provider is implemented, so the separation
+    # between `cloud` and `cloud(:ec2)` is muddy.
+    #
+    # The goal though is to allow
+    #
+    # * cloud with no predicate -- definitions that apply to all cloud
+    #   providers. If you only use one provider ever nothing stops you from
+    #   always saying `cloud`.
+    # * Declarations irrelevant to other providers are acceptable and will be ignored
+    # * Declarations that are wrong in the context of other providers (a `public_ip`
+    #   that is not available) will presumably cause a downstream error -- it's
+    #   your responsibility to overlay with provider-correct values.
+    # * There are several declarations that *could* be sensibly abstracted, but
+    #   are not. Rather than specifying `flavor 'm1.xlarge'`, I could ask for
+    #   :ram => 15, :cores => 4 or storage => 1500 and get the cheapest machine
+    #   that met or exceeded each constraint -- the default of `:price =>
+    #   :smallest` would get me a t1.micro on EC2, a 256MB on
+    #   Rackspace. Availability zones could also plausibly be parameterized.
+    #
+    # @example
+    #     # these apply regardless of cloud provider
+    #     cloud do
+    #       # this makes sense everywhere
+    #       image_name            'maverick'
+    #
+    #       # this is not offered by many providers, and its value is non-portable;
+    #       # but if you only run in one cloud there's harm in putting it here
+    #       # or overriding it.
+    #       public_ip             '1.2.3.4'
+    #
+    #       # Implemented differently across providers but its meaning is clear
+    #       security_group        :nagios
+    #
+    #       # This is harmless for the other clouds
+    #       availability_zones   ['us-east-1d']
+    #     end
+    #
+    #     # these only apply to ec2 launches.
+    #     # `ec2` is sugar for `cloud(:ec2)`.
+    #     ec2 do
+    #       spot_price_fraction   0.4
+    #     end
+    #
+    class Base < Ironfan::DslObject
+      has_keys(
+        :name, :flavor, :image_name, :image_id, :keypair,
+        :chef_client_script, :public_ip, :permanent )
+      attr_accessor :owner
+
+      def initialize(owner, *args)
+        self.owner = owner
+        super(*args)
+      end
+
+      # default values to apply where no value was set
+      # @returns [Hash] hash of defaults
+      def defaults
+        reverse_merge!({
+          :image_name         => 'natty',
+        })
+      end
+
+      # The username to ssh with.
+      # @return the ssh_user if set explicitly; otherwise, the user implied by the image name, if any; or else 'root'
+      def ssh_user(val=nil)
+        from_setting_or_image_info :ssh_user, val, 'root'
+      end
+
+      # Location of ssh private keys
+      def ssh_identity_dir(val=nil)
+        set :ssh_identity_dir, File.expand_path(val) unless val.nil?
+        @settings.include?(:ssh_identity_dir) ? @settings[:ssh_identity_dir] : Chef::Config.ec2_key_dir
+      end
+
+      # SSH identity file used for knife ssh, knife boostrap and such
+      def ssh_identity_file(val=nil)
+        set :ssh_identity_file, File.expand_path(val) unless val.nil?
+        @settings.include?(:ssh_identity_file) ? @settings[:ssh_identity_file] : File.join(ssh_identity_dir, "#{keypair}.pem")
+      end
+
+      # ID of the machine image to use.
+      # @return the image_id if set explicitly; otherwise, the id implied by the image name
+      def image_id(val=nil)
+        from_setting_or_image_info :image_id, val
+      end
+
+      # Distribution knife should target when bootstrapping an instance
+      # @return the bootstrap_distro if set explicitly; otherwise, the bootstrap_distro implied by the image name
+      def bootstrap_distro(val=nil)
+        from_setting_or_image_info :bootstrap_distro, val, "ubuntu10.04-gems"
+      end
+
+      def validation_key
+        IO.read(Chef::Config.validation_key) rescue ''
+      end
+
+      # The instance price, drawn from the compute flavor's info
+      def price
+        flavor_info[:price]
+      end
+
+      # The instance bitness, drawn from the compute flavor's info
+      def bits
+        flavor_info[:bits]
+      end
+
+    protected
+      # If value was explicitly set, use that; if the Chef::Config[:ec2_image_info] implies a value use that; otherwise use the default
+      def from_setting_or_image_info(key, val=nil, default=nil)
+        @settings[key] = val unless val.nil?
+        return @settings[key]  if @settings.include?(key)
+        return image_info[key] unless image_info.nil?
+        return default       # otherwise
+      end
+    end
+
+    class Ec2 < Base
+      has_keys(
+        :region, :availability_zones, :backing,
+        :spot_price, :spot_price_fraction,
+        :user_data, :security_groups,
+        :monitoring
+        )
+
+      def initialize(*args)
+        super *args
+        @settings[:security_groups]      ||= Mash.new
+        @settings[:user_data]            ||= Mash.new
+      end
+
+      #
+      # Sets some defaults for amazon cloud usage, and registers the root volume
+      #
+      def defaults
+        owner.volume(:root).reverse_merge!({
+            :device      => '/dev/sda1',
+            :mount_point => '/',
+            :mountable   => false,
+          })
+        self.reverse_merge!({
+            :availability_zones => ['us-east-1d'],
+            :backing            => 'ebs',
+            :flavor             => 't1.micro',
+          })
+        super
+      end
+
+      # adds a security group to the cloud instance
+      def security_group(sg_name, hsh={}, &block)
+        sg_name = sg_name.to_s
+        security_groups[sg_name] ||= Ironfan::Cloud::SecurityGroup.new(self, sg_name)
+        security_groups[sg_name].configure(hsh, &block)
+        security_groups[sg_name]
+      end
+
+      # With a value, sets the spot price to the given fraction of the
+      #   instance's full price (as found in Ironfan::Cloud::Aws::FLAVOR_INFO)
+      # With no value, returns the spot price as a fraction of the full instance price.
+      def spot_price_fraction(val=nil)
+        if val
+          spot_price( price.to_f * val )
+        else
+          spot_price / price rescue 0
+        end
+      end
+
+      # EC2 User data -- DNA typically used to bootstrap the machine.
+      # @param  [Hash] value -- when present, merged with the existing user data (overriding it)
+      # @return the user_data hash
+      def user_data(hsh={})
+        @settings[:user_data].merge!(hsh.to_hash) unless hsh.empty?
+        @settings[:user_data]
+      end
+
+      def reverse_merge!(hsh)
+        super(hsh.to_mash.compact)
+        @settings[:security_groups].reverse_merge!(hsh.security_groups) if hsh.respond_to?(:security_groups)
+        @settings[:user_data      ].reverse_merge!(hsh.user_data)       if hsh.respond_to?(:user_data)
+        self
+      end
+
+      def region(val=nil)
+        set(:region, val)
+        if    @settings[:region]        then @settings[:region]
+        elsif default_availability_zone then default_availability_zone.gsub(/^(\w+-\w+-\d)[a-z]/, '\1')
+        else  nil
+        end
+      end
+
+      def default_availability_zone
+        availability_zones.first if availability_zones
+      end
+
+      # Bring the ephemeral storage (local scratch disks) online
+      def mount_ephemerals(attrs={})
+        owner.volume(:ephemeral0, attrs){ device '/dev/sdb'; volume_id 'ephemeral0' ; mount_point '/mnt' ; tags( :bulk => true, :local => true, :fallback => true) } if flavor_info[:ephemeral_volumes] > 0
+        owner.volume(:ephemeral1, attrs){ device '/dev/sdc'; volume_id 'ephemeral1' ; mount_point '/mnt2'; tags( :bulk => true, :local => true, :fallback => true) } if flavor_info[:ephemeral_volumes] > 1
+        owner.volume(:ephemeral2, attrs){ device '/dev/sdd'; volume_id 'ephemeral2' ; mount_point '/mnt3'; tags( :bulk => true, :local => true, :fallback => true) } if flavor_info[:ephemeral_volumes] > 2
+        owner.volume(:ephemeral3, attrs){ device '/dev/sde'; volume_id 'ephemeral3' ; mount_point '/mnt4'; tags( :bulk => true, :local => true, :fallback => true) } if flavor_info[:ephemeral_volumes] > 3
+      end
+
+      # Utility methods
+
+      def image_info
+        Chef::Config[:ec2_image_info][ [region, bits, backing, image_name] ] or ( ui.warn "Make sure to define the machine's region, bits, backing and image_name. (Have #{[region, bits, backing, image_name].inspect})" ; {} )
+      end
+
+      def list_images
+        ui.info("Available images:")
+        Chef::Config[:ec2_image_info].each do |flavor_name, flavor|
+          ui.info("  #{flavor_name}\t#{flavor.inspect}")
+        end
+      end
+
+      def flavor(val=nil)
+        if val && (not FLAVOR_INFO.has_key?(val.to_s))
+          ui.warn("Unknown machine image flavor '#{val}'")
+          list_flavors
+        end
+        set :flavor, val
+      end
+
+      def flavor_info
+        FLAVOR_INFO[flavor] or ( ui.warn "Please define the machine's flavor: have #{self.inspect}" ; {} )
+      end
+
+      def list_flavors
+        ui.info("Available flavors:")
+        FLAVOR_INFO.each do |flavor_name, flavor|
+          ui.info("  #{flavor_name}\t#{flavor.inspect}")
+        end
+      end
+
+      # code            $/hr    $/mo    $/day   CPU/$   Mem/$    mem    cpu     cores   cpcore  storage  bits   IO              type            name
+      # t1.micro        $0.02     14     0.48   10.00   33.50    0.67    0.2    1        0.2       0       64   Low             Micro           Micro
+      # m1.small        $0.085    61     2.04   11.76   20.00    1.7     1      1        1       160       32   Moderate        Standard        Small
+      # c1.medium       $0.17    123     4.08   29.41   10.00    1.7     5      2        2.5     350       32   Moderate        High-CPU        Medium
+      # m1.large        $0.34    246     8.16   11.76   22.06    7.5     4      2        2       850       64   High            Standard        Large
+      # m2.xlarge       $0.50    363    12.00   13.00   35.40   17.7     6.5    2        3.25    420       64   Moderate        High-Memory     Extra Large
+      # c1.xlarge       $0.68    493    16.32   29.41   10.29    7      20      8        2.5    1690       64   High            High-CPU        Extra Large
+      # m1.xlarge       $0.68    493    16.32   11.76   22.06   15       8      4        2      1690       64   High            Standard        Extra Large
+      # m2.2xlarge      $1.00    726    24.00   13.00   34.20   34.2    13      4        3.25    850       64   High            High-Memory     Double Extra Large
+      # m2.4xlarge      $2.00   1452    48.00   13.00   34.20   68.4    26      8        3.25   1690       64   High            High-Memory     Quadruple Extra Large
+      # cc1.4xlarge     $1.60   1161    38.40   20.94   14.38   23      33.5    2       16.75   1690       64   Very High 10GB  Compute         Quadruple Extra Large
+      # cg1.4xlarge     $2.10   1524    50.40   15.95   10.48   22      33.5    2       16.75   1690       64   Very High 10GB  Cluster GPU     Quadruple Extra Large
+
+      FLAVOR_INFO = {
+        't1.micro'    => { :price => 0.02,  :bits => '64-bit', :ram =>    686, :cores => 1, :core_size => 0.25, :inst_disks => 0, :inst_disk_size =>    0, :ephemeral_volumes => 0 },
+        'm1.small'    => { :price => 0.085, :bits => '32-bit', :ram =>   1740, :cores => 1, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  160, :ephemeral_volumes => 1 },
+        'c1.medium'   => { :price => 0.17,  :bits => '32-bit', :ram =>   1740, :cores => 2, :core_size => 2.5,  :inst_disks => 1, :inst_disk_size =>  350, :ephemeral_volumes => 1 },
+        'm1.large'    => { :price => 0.34,  :bits => '64-bit', :ram =>   7680, :cores => 2, :core_size => 2,    :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2 },
+        'm2.xlarge'   => { :price => 0.50,  :bits => '64-bit', :ram =>  18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1 },
+        'c1.xlarge'   => { :price => 0.68,  :bits => '64-bit', :ram =>   7168, :cores => 8, :core_size => 2.5,  :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
+        'm1.xlarge'   => { :price => 0.68,  :bits => '64-bit', :ram =>  15360, :cores => 4, :core_size => 2,    :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
+        'm2.2xlarge'  => { :price => 1.00,  :bits => '64-bit', :ram =>  35020, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2 },
+        'm2.4xlarge'  => { :price => 2.00,  :bits => '64-bit', :ram =>  70041, :cores => 8, :core_size => 3.25, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
+        'cc1.4xlarge' => { :price => 1.60,  :bits => '64-bit', :ram =>  23552, :cores => 2, :core_size =>16.75, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2 },
+        'cg1.4xlarge' => { :price => 2.10,  :bits => '64-bit', :ram =>  22528, :cores => 2, :core_size =>16.75, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2 },
+      }
+
+      #
+      # To add to this list, use this snippet:
+      #
+      #     Chef::Config[:ec2_image_info] ||= {}
+      #     Chef::Config[:ec2_image_info].merge!({
+      #       # ... lines like the below
+      #     })
+      #
+      # in your knife.rb or whereever. We'll notice that it exists and add to it, rather than clobbering it.
+      #
+      Chef::Config[:ec2_image_info] ||= {}
+      Chef::Config[:ec2_image_info].merge!({
+
+          #
+          # Lucid (Ubuntu 9.10)
+          #
+          %w[us-east-1             64-bit  instance        karmic                         ] => { :image_id => 'ami-55739e3c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-east-1             32-bit  instance        karmic                         ] => { :image_id => 'ami-bb709dd2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-west-1             64-bit  instance        karmic                         ] => { :image_id => 'ami-cb2e7f8e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-west-1             32-bit  instance        karmic                         ] => { :image_id => 'ami-c32e7f86', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[eu-west-1             64-bit  instance        karmic                         ] => { :image_id => 'ami-05c2e971', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[eu-west-1             32-bit  instance        karmic                         ] => { :image_id => 'ami-2fc2e95b', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+
+          #
+          # Lucid (Ubuntu 10.04.3)
+          #
+          %w[ap-southeast-1        64-bit  ebs             lucid                          ] => { :image_id => 'ami-77f28d25', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ap-southeast-1        32-bit  ebs             lucid                          ] => { :image_id => 'ami-4df28d1f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ap-southeast-1        64-bit  instance        lucid                          ] => { :image_id => 'ami-57f28d05', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ap-southeast-1        32-bit  instance        lucid                          ] => { :image_id => 'ami-a5f38cf7', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[eu-west-1             64-bit  ebs             lucid                          ] => { :image_id => 'ami-ab4d67df', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[eu-west-1             32-bit  ebs             lucid                          ] => { :image_id => 'ami-a94d67dd', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[eu-west-1             64-bit  instance        lucid                          ] => { :image_id => 'ami-a54d67d1', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[eu-west-1             32-bit  instance        lucid                          ] => { :image_id => 'ami-cf4d67bb', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[us-east-1             64-bit  ebs             lucid                          ] => { :image_id => 'ami-4b4ba522', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-east-1             32-bit  ebs             lucid                          ] => { :image_id => 'ami-714ba518', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-east-1             64-bit  instance        lucid                          ] => { :image_id => 'ami-fd4aa494', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-east-1             32-bit  instance        lucid                          ] => { :image_id => 'ami-2d4aa444', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[us-west-1             64-bit  ebs             lucid                          ] => { :image_id => 'ami-d197c694', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-west-1             32-bit  ebs             lucid                          ] => { :image_id => 'ami-cb97c68e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-west-1             64-bit  instance        lucid                          ] => { :image_id => 'ami-c997c68c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[us-west-1             32-bit  instance        lucid                          ] => { :image_id => 'ami-c597c680', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+
+          #
+          # Maverick (Ubuntu 10.10)
+          #
+          %w[ ap-southeast-1       64-bit  ebs             maverick                       ] => { :image_id => 'ami-32423c60', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  instance        maverick                       ] => { :image_id => 'ami-12423c40', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       32-bit  ebs             maverick                       ] => { :image_id => 'ami-0c423c5e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       32-bit  instance        maverick                       ] => { :image_id => 'ami-7c423c2e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ eu-west-1            64-bit  ebs             maverick                       ] => { :image_id => 'ami-e59ca991', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  instance        maverick                       ] => { :image_id => 'ami-1b9ca96f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            32-bit  ebs             maverick                       ] => { :image_id => 'ami-fb9ca98f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            32-bit  instance        maverick                       ] => { :image_id => 'ami-339ca947', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-east-1            64-bit  ebs             maverick                       ] => { :image_id => 'ami-cef405a7', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  instance        maverick                       ] => { :image_id => 'ami-08f40561', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            32-bit  ebs             maverick                       ] => { :image_id => 'ami-ccf405a5', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            32-bit  instance        maverick                       ] => { :image_id => 'ami-a6f504cf', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-west-1            64-bit  ebs             maverick                       ] => { :image_id => 'ami-af7e2eea', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  instance        maverick                       ] => { :image_id => 'ami-a17e2ee4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            32-bit  ebs             maverick                       ] => { :image_id => 'ami-ad7e2ee8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            32-bit  instance        maverick                       ] => { :image_id => 'ami-957e2ed0', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+
+          #
+          # Natty (Ubuntu 11.04)
+          #
+          %w[ ap-northeast-1       32-bit  ebs             natty                          ] => { :image_id => 'ami-00b10501', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       32-bit  instance        natty                          ] => { :image_id => 'ami-f0b004f1', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       64-bit  ebs             natty                          ] => { :image_id => 'ami-02b10503', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       64-bit  instance        natty                          ] => { :image_id => 'ami-fab004fb', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ ap-southeast-1       32-bit  ebs             natty                          ] => { :image_id => 'ami-06255f54', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       32-bit  instance        natty                          ] => { :image_id => 'ami-72255f20', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  ebs             natty                          ] => { :image_id => 'ami-04255f56', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  instance        natty                          ] => { :image_id => 'ami-7a255f28', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ eu-west-1            32-bit  ebs             natty                          ] => { :image_id => 'ami-a4f7c5d0', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            32-bit  instance        natty                          ] => { :image_id => 'ami-fef7c58a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  ebs             natty                          ] => { :image_id => 'ami-a6f7c5d2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  instance        natty                          ] => { :image_id => 'ami-c0f7c5b4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-east-1            32-bit  ebs             natty                          ] => { :image_id => 'ami-e358958a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            32-bit  instance        natty                          ] => { :image_id => 'ami-c15994a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  ebs             natty                          ] => { :image_id => 'ami-fd589594', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  instance        natty                          ] => { :image_id => 'ami-71589518', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-west-1            32-bit  ebs             natty                          ] => { :image_id => 'ami-43580406', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            32-bit  instance        natty                          ] => { :image_id => 'ami-e95f03ac', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  ebs             natty                          ] => { :image_id => 'ami-4d580408', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  instance        natty                          ] => { :image_id => 'ami-a15f03e4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+
+          #
+          # Oneric (Ubuntu 11.10)
+          #
+          %w[ ap-northeast-1       32-bit  ebs             oneric                         ] => { :image_id => 'ami-84902785', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       32-bit  instance        oneric                         ] => { :image_id => 'ami-5e90275f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       64-bit  ebs             oneric                         ] => { :image_id => 'ami-88902789', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       64-bit  instance        oneric                         ] => { :image_id => 'ami-7c90277d', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ ap-southeast-1       32-bit  ebs             oneric                         ] => { :image_id => 'ami-0a327758', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       32-bit  instance        oneric                         ] => { :image_id => 'ami-00327752', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  ebs             oneric                         ] => { :image_id => 'ami-0832775a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  instance        oneric                         ] => { :image_id => 'ami-04327756', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ eu-west-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-11f0cc65', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-4ff0cc3b', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-1df0cc69', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-23f0cc57', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-east-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-a562a9cc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-3962a950', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-bf62a9d6', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-c162a9a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-west-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-c9a1fe8c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-21a1fe64', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-cba1fe8e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-3fa1fe7a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          #
+          %w[ us-west-2            32-bit  ebs             oneric                         ] => { :image_id => 'ami-ea9a17da', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            32-bit  instance        oneric                         ] => { :image_id => 'ami-f49a17c4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            64-bit  ebs             oneric                         ] => { :image_id => 'ami-ec9a17dc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            64-bit  instance        oneric                         ] => { :image_id => 'ami-fe9a17ce', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+        })
+    end
+
+    class Slicehost < Base
+      # server_name
+      # slicehost_password
+      # Proc.new { |password| Chef::Config[:knife][:slicehost_password] = password }
+
+      # personality
+    end
+
+    class Rackspace < Base
+      # api_key, api_username, server_name
+    end
+
+    class Terremark < Base
+      # password, username, service
+    end
+  end
+end