ironfan 3.2.2 → 4.0.0

data/lib/ironfan/chef_layer.rb

@@ -1,300 +0,0 @@
-#
-# 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.dry_run?
-        ui.info("      ... but not really (#{ui.color("dry run", :bold, :yellow)} for server #{name})")
-        return nil
-      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.realdirpath(__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
-      volumes.each_pair do |vol_name, vol|
-        chef_node.normal[:volumes] ||= Mash.new
-        chef_node.normal[:volumes][vol_name] = vol.attributes.compact
-      end
-    end
-
-    def set_chef_node_attributes
-      step("  setting node runlist and essential attributes")
-      @chef_node.run_list = Chef::RunList.new(*combined_run_list)
-      @chef_node.normal[:organization] = organization if organization
-      @chef_node.normal[:permanent]    = cloud.permanent if cloud.permanent
-      @chef_node.normal[:cluster_name] = cluster_name
-      @chef_node.normal[:facet_name]   = facet_name
-      @chef_node.normal[: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

@@ -1,323 +0,0 @@
-require 'ironfan/private_key'
-
-module Ironfan
-  module CloudDsl
-    class Base < Ironfan::DslBuilder
-      magic :bootstrap_distro, String, :default => "ubuntu10.04-gems"
-      magic :chef_client_script, String
-      magic :flavor, String
-      magic :flavor_info, Array
-      magic :image_name, String
-      magic :ssh_user, String, :default => 'root'
-
-      magic :owner, Whatever
-
-      def initialize(container, *args)
-        owner     container
-        super(*args)
-      end
-
-      def to_hash
-        Chef::Log.warn("Using to_hash is depreciated, use attributes instead")
-        attributes
-      end
-
-      # Stub to be filled by child classes
-      def defaults
-      end
-
-      # # TODO: Replace the lambda with an underlay from image_info?
-      # magic :image_id, String, :default => lambda { image_info[:image_id] unless image_info.nil? }
-      def image_id
-        return @image_id if @image_id
-        image_info[:image_id] unless image_info.nil?
-      end
-## TODO: Replace with code that will assume ssh_identity_dir if ssh_identity_file isn't absolutely pathed
-#       # 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
-    end
-    
-    class Ec2 < Base
-      #
-      # 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", },
-
-        #
-        # Cluster Compute
-        #
-        # IMAGE   ami-6d2ce204    205199409180/Globus Provision 0.4.AMI (Ubuntu 11.04 HVM)            205199409180    available       public          x86_64  machine                 ebs             hvm             xen
-        #
-        %w[ us-east-1            64-bit  ebs             natty-cc   ] => { :image_id => 'ami-6d2ce204', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-
-        #
-        # Oneiric (Ubuntu 11.10)
-        #
-        %w[ ap-northeast-1       32-bit  ebs             oneiric    ] => { :image_id => 'ami-84902785', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ ap-northeast-1       32-bit  instance        oneiric    ] => { :image_id => 'ami-5e90275f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ ap-northeast-1       64-bit  ebs             oneiric    ] => { :image_id => 'ami-88902789', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ ap-northeast-1       64-bit  instance        oneiric    ] => { :image_id => 'ami-7c90277d', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        #
-        %w[ ap-southeast-1       32-bit  ebs             oneiric    ] => { :image_id => 'ami-0a327758', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ ap-southeast-1       32-bit  instance        oneiric    ] => { :image_id => 'ami-00327752', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ ap-southeast-1       64-bit  ebs             oneiric    ] => { :image_id => 'ami-0832775a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ ap-southeast-1       64-bit  instance        oneiric    ] => { :image_id => 'ami-04327756', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        #
-        %w[ eu-west-1            32-bit  ebs             oneiric    ] => { :image_id => 'ami-11f0cc65', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ eu-west-1            32-bit  instance        oneiric    ] => { :image_id => 'ami-4ff0cc3b', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ eu-west-1            64-bit  ebs             oneiric    ] => { :image_id => 'ami-1df0cc69', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ eu-west-1            64-bit  instance        oneiric    ] => { :image_id => 'ami-23f0cc57', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        #
-        %w[ us-east-1            32-bit  ebs             oneiric    ] => { :image_id => 'ami-a562a9cc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-east-1            32-bit  instance        oneiric    ] => { :image_id => 'ami-3962a950', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-east-1            64-bit  ebs             oneiric    ] => { :image_id => 'ami-bf62a9d6', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-east-1            64-bit  instance        oneiric    ] => { :image_id => 'ami-c162a9a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        #
-        %w[ us-west-1            32-bit  ebs             oneiric    ] => { :image_id => 'ami-c9a1fe8c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-west-1            32-bit  instance        oneiric    ] => { :image_id => 'ami-21a1fe64', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-west-1            64-bit  ebs             oneiric    ] => { :image_id => 'ami-cba1fe8e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-west-1            64-bit  instance        oneiric    ] => { :image_id => 'ami-3fa1fe7a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        #
-        %w[ us-west-2            32-bit  ebs             oneiric    ] => { :image_id => 'ami-ea9a17da', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-west-2            32-bit  instance        oneiric    ] => { :image_id => 'ami-f49a17c4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-west-2            64-bit  ebs             oneiric    ] => { :image_id => 'ami-ec9a17dc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-        %w[ us-west-2            64-bit  instance        oneiric    ] => { :image_id => 'ami-fe9a17ce', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-      })
-
-      magic :availability_zones, Array, :default => ['us-east-1d']
-      magic :backing, String, :default => 'ebs'
-      magic :ec2_image_info, Hash, :default => Chef::Config[:ec2_image_info]
-      magic :flavor, String, :default => 't1.micro'
-      magic :image_name, String, :default => 'natty'
-      magic :keypair, Whatever
-      magic :monitoring, String
-      magic :permanent, String
-      magic :public_ip, String
-      magic :region, String, 
-          :default => ->{ default_availability_zone.gsub(/^(\w+-\w+-\d)[a-z]/, '\1') if default_availability_zone }
-      collection :security_groups, Ironfan::CloudDsl::SecurityGroup, :resolution => ->(f){ merge_resolve(f) }
-      magic :ssh_user, String, :default => 'ubuntu'
-      magic :ssh_identity_dir, String, :default => Chef::Config.ec2_key_dir
-      magic :ssh_identity_file, String #, :default => "#{keypair}.pem"
-      magic :subnet, String
-      magic :user_data, Hash, :default => {}
-      magic :validation_key, String, :default => IO.read(Chef::Config.validation_key) rescue ''
-      magic :vpc, String
-
-      def list_images
-        ui.info("Available images:")
-        ec2_image_info.each do |flavor_name, flavor|
-          ui.info("  %-55s\t%s" % [flavor_name, flavor.inspect])
-        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
-
-      def image_info
-        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, virtualization].inspect})" ; {} )
-      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={})
-        result = read_attribute(:user_data)
-        write_attribute(:user_data, result.merge!(hsh.to_hash)) unless hsh.empty?
-        result
-      end
-
-      # Sets default root volume for AWS
-      def defaults
-        owner.volume(:root).receive!({
-            :device      => '/dev/sda1',
-            :mount_point => '/',
-            :mountable   => false,
-          })
-        super
-      end
-
-      # The instance bitness, drawn from the compute flavor's info
-      def bits
-        flavor_info[:bits]
-      end
-
-      def virtualization
-        flavor_info[:virtualization] || 'pv'
-      end
-
-      def flavor_info
-        if flavor && (not FLAVOR_INFO.has_key?(flavor))
-          ui.warn("Unknown machine image flavor '#{val}'")
-          list_flavors
-          return nil
-        end
-        FLAVOR_INFO[flavor]
-      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            $/mo     $/day   $/hr   CPU/$   Mem/$     mem     cpu   cores   cpcore  storage bits    IO              type            name
-      # t1.micro          15      0.48    .02      13      13     0.61    0.25   0.25     1           0    32   Low             Micro           Micro
-      # m1.small          58      1.92    .08      13      21     1.7     1      1        1         160    32   Moderate        Standard        Small
-      # m1.medium        116      3.84    .165     13      13     3.75    2      2        1         410    32   Moderate        Standard        Medium
-      # c1.medium        120      3.96    .17      30      10     1.7     5      2        2.5       350    32   Moderate        High-CPU        Medium
-      # m1.large         232      7.68    .32      13      23     7.5     4      2        2         850    64   High            Standard        Large
-      # m2.xlarge        327     10.80    .45      14      38    17.1     6.5    2        3.25      420    64   Moderate        High-Memory     Extra Large
-      # m1.xlarge        465     15.36    .64      13      23    15       8      4        2        1690    64   High            Standard        Extra Large
-      # c1.xlarge        479     15.84    .66      30      11     7      20      8        2.5      1690    64   High            High-CPU        Extra Large
-      # m2.2xlarge       653     21.60    .90      14      38    34.2    13      4        3.25      850    64   High            High-Memory     Double Extra Large
-      # m2.4xlarge      1307     43.20   1.80      14      38    68.4    26      8        3.25     1690    64   High            High-Memory     Quadruple Extra Large
-      # cc1.4xlarge      944     31.20   1.30      26      18    23      33.5    8        4.19     1690    64   10GB            Compute         Quadruple Extra Large
-      # cc2.8xlarge     1742     57.60   2.40      37      25    60.5    88     16        5.50     3370    64   Very High 10GB  Compute         Eight Extra Large
-      # cg1.4xlarge     1525     50.40   2.10      16      10    22      33.5    8        4.19     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.08,  :bits => '64-bit', :ram =>   1740, :cores => 1, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  160, :ephemeral_volumes => 1 },
-        'm1.medium'   => { :price => 0.165, :bits => '32-bit', :ram =>   3840, :cores => 2, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  410, :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.32,  :bits => '64-bit', :ram =>   7680, :cores => 2, :core_size => 2,    :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2 },
-        'm2.xlarge'   => { :price => 0.45,  :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.64,  :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.66,  :bits => '64-bit', :ram =>  15360, :cores => 4, :core_size => 2,    :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
-        'm2.2xlarge'  => { :price => 0.90,  :bits => '64-bit', :ram =>  35020, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2 },
-        'm2.4xlarge'  => { :price => 1.80,  :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.30,  :bits => '64-bit', :ram =>  23552, :cores => 8, :core_size => 4.19, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
-        'cc1.8xlarge' => { :price => 2.40,  :bits => '64-bit', :ram =>  61952, :cores =>16, :core_size => 5.50, :inst_disks => 8, :inst_disk_size => 3370, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm' },
-        'cg1.4xlarge' => { :price => 2.10,  :bits => '64-bit', :ram =>  22528, :cores => 8, :core_size => 4.19, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
-      }
-    end
-
-    class VirtualBox < Base
-      # # These fields are probably nonsense in VirtualBox
-      # magic :availability_zones, String
-      # magic :backing, String
-      # magic :default_availability_zone, String
-      # magic :flavor_info, Array, :default => { :placement_groupable => false }
-      # magic :keypair, Ironfan::PrivateKey
-      # magic :monitoring, String
-      # magic :permanent, String
-      # magic :public_ip, String
-      # magic :security_groups, Array, :default => { :keys => nil }
-      # magic :subnet, String
-      # magic :user_data, String
-      # magic :validation_key, String
-      # magic :vpc, String
-
-      def initialize(*args)
-        Chef::Log.warn("Several fields (e.g. - availability_zones, backing, mount_ephemerals, etc.) are nonsense in VirtualBox context")
-        super(*args)
-      end
-    end
-
-  end
-end