ironfan 3.2.2 → 4.0.0

data/lib/ironfan/dsl/compute.rb

@@ -0,0 +1,84 @@
+module Ironfan
+  class Dsl
+
+    class Compute < Ironfan::Dsl
+      @@run_list_rank = 0
+      field      :name,         String
+
+      # Resolve each of the following as a merge of their container's attributes and theirs
+      collection :run_list_items, Hash,                    :resolver => :merge_resolve
+      collection :clouds,       Ironfan::Dsl::Cloud,       :resolver => :merge_resolve
+      collection :volumes,      Ironfan::Dsl::Volume,      :resolver => :merge_resolve
+
+      # Resolve these normally (overriding on each layer)
+      magic      :environment,  Symbol,                    :default => :_default
+      magic      :use_cloud,    Symbol
+
+      member     :cluster_role, Ironfan::Dsl::Role
+      member     :facet_role,   Ironfan::Dsl::Role
+
+      def initialize(attrs={},&block)
+        self.underlay   = attrs[:owner] if attrs[:owner]
+        super
+      end
+
+      def fullname()    name;   end
+
+      # Add the given role/recipe to the run list. You can specify placement of
+      #   `:first`, `:normal` (or nil) or `:last`; the final runlist is assembled
+      #   in order by placement, and then by source position.
+      def role(role_name, placement=nil)
+        add_to_run_list("role[#{role_name}]", placement)
+      end
+      def recipe(recipe_name, placement=nil)
+        add_to_run_list(recipe_name, placement)
+      end
+      def run_list
+        mapper = run_list_items.values.map
+        result =  mapper.each {|i| i[:name] if i[:placement]==:first  }
+        result += mapper.each {|i| i[:name] if i[:placement]==:normal }
+        result += mapper.each {|i| i[:name] if i[:placement]==:last   }
+        result.compact
+      end
+
+      def raid_group(rg_name, attrs={}, &block)
+        raid = volumes[rg_name] || Ironfan::Dsl::RaidGroup.new
+        raid.receive!(attrs, &block)
+        raid.sub_volumes.each do |sv_name|
+          volume(sv_name){ in_raid(rg_name) ; mountable(false) ; tags({}) }
+        end
+        volumes[rg_name] = raid
+      end
+
+      # TODO: Expand the logic here to include CLI parameters, probably by injecting
+      #   the CLI as a layer in the underlay structure
+      def selected_cloud
+        raise "No clouds defined, cannot select a cloud" if clouds.length == 0
+
+        # Use the selected cloud for this server
+        unless use_cloud.nil?
+          return cloud(use_cloud) if clouds.include? use_cloud
+          raise "Requested a cloud (#{use_cloud}) that is not defined"
+        end
+
+        # Use the cloud marked default_cloud
+        default = clouds.values.select{|c| c.default_cloud == true }
+        raise "More than one cloud (#{default.map{|c| c.name}.join(', ')}) marked default" if default.length > 1
+        return default[0] unless default.empty?
+
+        # Use the first cloud defined
+        clouds.values.first
+      end
+
+    protected
+
+      def add_to_run_list(item, placement=nil)
+        raise "run_list placement must be one of :first, :normal, :last or nil (also means :normal)" unless [:first, :last, :own, nil].include?(placement)
+        placement = :normal if placement.nil?
+        @@run_list_rank += 1
+        run_list_items[item] = { :name => item, :rank => @@run_list_rank, :placement => placement }
+      end
+    end
+
+  end
+end

data/lib/ironfan/dsl/ec2.rb

@@ -0,0 +1,260 @@
+module Ironfan
+  class Dsl
+
+    class Compute < Ironfan::Dsl
+      def ec2(*attrs,&block)            cloud(:ec2,*attrs,&block);      end
+    end
+
+    class Ec2 < Cloud
+      magic :availability_zones,        Array,          :default => ['us-east-1d']
+      magic :backing,                   String,         :default => 'ebs'
+      magic :bootstrap_distro,          String
+      magic :chef_client_script,        String
+      magic :default_availability_zone, String,         :default => ->{availability_zones.first}
+      magic :flavor,                    String,         :default => 't1.micro'
+      magic :image_name,                String
+      magic :image_id,                  String
+      magic :keypair,                   Whatever
+      magic :mount_ephemerals,          Hash,           :default => {}
+      magic :monitoring,                String
+      magic :permanent,                 :boolean,       :default => false
+      magic :public_ip,                 String
+      magic :placement_group,           String
+      magic :region,                    String,         :default => -> do
+        default_availability_zone.gsub(/^(\w+-\w+-\d)[a-z]/, '\1') if default_availability_zone
+      end
+      collection :security_groups,      Ironfan::Dsl::Ec2::SecurityGroup
+      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 :validation_key,            String,         :default => ->{ IO.read(Chef::Config.validation_key) rescue '' }
+      magic :vpc,                       String
+
+      magic :provider,                  Ironfan::Provider,      :default => Ironfan::Provider::Ec2
+
+      def ec2_image_info
+        keys = [region, flavor_info[:bits], backing, image_name]
+        Chef::Config[:ec2_image_info][ keys ] || {}
+      end
+
+      def image_id
+        result = read_attribute(:image_id) || ec2_image_info[:image_id]
+      end
+
+      def to_display(style,values={})
+        return values if style == :minimal
+
+        values["Flavor"] =            flavor
+        values["AZ"] =                default_availability_zone
+        return values if style == :default
+
+        values["Elastic IP"] =        public_ip if public_ip
+        values
+      end
+
+      def flavor_info
+        if not Chef::Config[:ec2_flavor_info].has_key?(flavor)
+          ui.warn("Unknown machine image flavor '#{val}'")
+          list_flavors
+          return nil
+        end
+        Chef::Config[:ec2_flavor_info][flavor]
+      end
+
+      def implied_volumes
+        result = []
+        if backing == 'ebs'
+          result << Ironfan::Dsl::Volume.new(:name => 'root') do
+            device              '/dev/sda1'
+            fstype              'ext4'
+            keep                false
+            mount_point         '/'
+          end
+        end
+        return result unless (mount_ephemerals and (flavor_info[:ephemeral_volumes] > 0))
+
+        layout = {  0 => ['/dev/sdb','/mnt'],
+                    1 => ['/dev/sdc','/mnt2'],
+                    2 => ['/dev/sdd','/mnt3'],
+                    3 => ['/dev/sde','/mnt4']   }
+        ( 0 .. (flavor_info[:ephemeral_volumes]-1) ).each do |idx|
+          dev, mnt = layout[idx]
+          ephemeral = Ironfan::Dsl::Volume.new(:name => "ephemeral#{idx}") do
+            attachable          'ephemeral'
+            fstype              'ext3'
+            device              dev
+            mount_point         mnt
+            mount_options       'defaults,noatime'
+            tags({:bulk => true, :local => true, :fallback => true})
+          end
+          ephemeral.receive! mount_ephemerals
+          result << ephemeral
+        end
+        result
+      end
+
+      class SecurityGroup < Ironfan::Dsl
+        field :name,                    String
+        field :group_authorized_by,     Array, :default => []
+        field :range_authorizations,    Array, :default => []
+
+        def authorize_port_range(range, cidr_ip = '0.0.0.0/0', ip_protocol = 'tcp')
+          range = (range .. range) if range.is_a?(Integer)
+          range_authorizations << [range, cidr_ip, ip_protocol]
+          range_authorizations.compact!
+        end
+
+        def authorized_by_group(other_name)
+          group_authorized_by << other_name.to_s
+          group_authorized_by.compact!
+        end
+      end
+
+    end
+
+  end
+end
+
+Chef::Config[:ec2_flavor_info] ||= {}
+Chef::Config[:ec2_flavor_info].merge!({
+  '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' },
+})
+
+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", },
+})

data/lib/ironfan/dsl/facet.rb

@@ -0,0 +1,25 @@
+module Ironfan
+  class Dsl
+
+    class Facet < Ironfan::Dsl::Compute
+      magic      :instances,    Integer,                :default => 1
+      collection :servers,      Ironfan::Dsl::Server,   :resolver => :deep_resolve
+      field      :cluster_name, String
+
+      def initialize(attrs={},&block)
+        self.cluster_name       = attrs[:owner].name unless attrs[:owner].nil?
+        self.name               = attrs[:name] unless attrs[:name].nil?
+        self.facet_role         Ironfan::Dsl::Role.new(:name => fullname.sub('-','_'))
+        super
+      end
+
+      def fullname()            "#{cluster_name}-#{name}";      end
+
+      def expand_servers!
+        for i in 0..(instances-1) do server(i); end
+      end
+
+    end
+
+  end
+end

data/lib/ironfan/dsl/role.rb

@@ -0,0 +1,19 @@
+module Ironfan
+  class Dsl
+
+    class Role < Ironfan::Dsl
+      magic     :override_attributes, Hash, :default => {}
+      magic     :default_attributes,  Hash, :default => {}
+
+      def override_attributes(val=nil)
+        return super() if val.nil?
+        super(read_attribute(:override_attributes).deep_merge(val))
+      end
+      def default_attributes(val=nil)
+        return super() if val.nil?
+        super(read_attribute(:default_attributes).deep_merge(val))
+      end
+    end
+
+  end
+end

data/lib/ironfan/dsl/server.rb

@@ -0,0 +1,31 @@
+module Ironfan
+  class Dsl
+
+    class Server < Ironfan::Dsl::Compute
+      field      :cluster_name, String
+      field      :facet_name,   String
+
+      def initialize(attrs={},&block)
+        unless attrs[:owner].nil?
+          self.cluster_name =   attrs[:owner].cluster_name
+          self.facet_name =     attrs[:owner].name
+        end
+        super
+      end
+
+      def fullname()            "#{cluster_name}-#{facet_name}-#{name}";        end
+      def index()               name.to_i;                                      end
+      def implied_volumes()     selected_cloud.implied_volumes;                 end
+
+      def to_display(style,values={})
+        selected_cloud.to_display(style,values)
+
+        return values if style == :minimal
+
+        values["Env"] =         environment
+        values
+      end
+    end
+
+  end
+end

data/lib/ironfan/dsl/virtualbox.rb

@@ -0,0 +1,8 @@
+module Ironfan
+  module Dsl
+
+    class VirtualBox < Cloud
+    end
+
+  end
+end

data/lib/ironfan/dsl/volume.rb

@@ -0,0 +1,45 @@
+module Ironfan
+  class Dsl
+
+    class Volume < Ironfan::Dsl
+      field     :name,                  String
+
+      magic     :attachable,            String,   :default => 'ebs'
+      magic     :availability_zone,     String
+      magic     :create_at_launch,      :boolean, :default => false
+      magic     :device,                String
+      magic     :formattable,           :boolean, :default => false
+      magic     :fstype,                String,   :default => 'xfs'
+      magic     :in_raid,               :boolean, :default => false
+      magic     :keep,                  :boolean, :default => true
+      magic     :mount_dump,            String
+      magic     :mount_pass,            String
+      magic     :mount_options,         String,   :default => 'defaults,nouuid,noatime'
+      magic     :mount_point,           String
+      magic     :mountable,             :boolean, :default => true
+      magic     :size,                  String
+      magic     :volume_id,             String
+      magic     :resizable,             :boolean, :default => false
+      magic     :snapshot_id,           String
+      magic     :snapshot_name,         String
+      magic     :tags,                  Hash,     :default => {}
+    end
+
+    class RaidGroup < Volume
+      # volumes that comprise this raid group
+      magic     :sub_volumes,           Array,    :default => []
+      # RAID level (http://en.wikipedia.org/wiki/RAID#Standard_levels)
+      magic     :level,                 String
+      # Raid chunk size (https://raid.wiki.kernel.org/articles/r/a/i/RAID_setup_cbb2.html)
+      magic     :chunk,                 String
+      # read-ahead buffer
+      magic     :read_ahead,            String
+
+      # Overrides of Volume field defaults
+      magic     :attachable,            :boolean, :default => false
+      magic     :formattable,           :boolean, :default => true
+      magic     :mount_options,         String,   :default => 'defaults,nobootwait,noatime,nouuid,comment=ironfan'
+    end
+
+  end
+end

data/lib/ironfan/dsl.rb

@@ -0,0 +1,7 @@
+module Ironfan
+
+  class Dsl < Builder
+    include Gorillib::Resolution
+  end
+
+end

data/lib/ironfan/headers.rb

@@ -0,0 +1,58 @@
+# This file sets up the base class structure before any of it is
+#   loaded, to allow parts to declare relationships to each other
+#   without regard to declaration order. No active code should
+#   be present in this file.
+module Ironfan
+
+  class Builder
+    include Gorillib::Builder
+  end
+
+  class Broker < Builder
+    class Computer < Builder; end
+    class Computers < Gorillib::ModelCollection; end
+    class Drive < Builder; end
+  end
+
+  class Dsl < Builder
+    class Compute < Ironfan::Dsl; end
+    class Cluster < Ironfan::Dsl::Compute; end
+    class Facet < Ironfan::Dsl::Compute; end
+    class Server < Ironfan::Dsl::Compute; end
+
+    class Role < Ironfan::Dsl; end
+    class Volume < Ironfan::Dsl; end
+
+    class Cloud < Ironfan::Dsl; end
+    class Ec2 < Cloud
+      class SecurityGroup < Ironfan::Dsl; end
+    end
+    class VirtualBox < Cloud; end
+  end
+
+  class Provider < Builder
+    class Resource < Builder; end
+  end
+  class IaasProvider < Provider
+    class Machine < Resource; end
+  end
+  class Provider
+    class ChefServer < Ironfan::Provider
+      class Client < Ironfan::Provider::Resource; end
+      class Node < Ironfan::Provider::Resource; end
+      class Role < Ironfan::Provider::Resource; end
+    end
+    class Ec2 < Ironfan::IaasProvider
+      class EbsVolume < Ironfan::Provider::Resource; end
+      class ElasticIp < Ironfan::Provider::Resource; end
+      class Machine < Ironfan::IaasProvider::Machine; end
+      class KeyPair < Ironfan::Provider::Resource; end
+      class PlacementGroup < Ironfan::Provider::Resource; end
+      class SecurityGroup < Ironfan::Provider::Resource; end
+    end
+    class VirtualBox < Ironfan::IaasProvider
+      class Machine < Ironfan::IaasProvider::Machine; end
+    end
+  end
+
+end

data/lib/ironfan/provider/chef/client.rb

@@ -0,0 +1,77 @@
+module Ironfan
+  class Provider
+    class ChefServer
+
+      class Client < Ironfan::Provider::Resource
+        delegate :add_to_index, :admin, :cdb_destroy, :cdb_save, 
+            :class_from_file, :couchdb, :couchdb=, :couchdb_id, :couchdb_id=, 
+            :couchdb_rev, :couchdb_rev=, :create, :create_keys, 
+            :delete_from_index, :destroy, :from_file, :index_id, :index_id=, 
+            :index_object_type, :name, :public_key, :save, :set_or_return, 
+            :to_hash, :validate, :with_indexer_metadata,
+          :to => :adaptee
+        field :key_filename,    String,
+            :default => ->{ "#{Client.key_dir}/client-#{name}.pem" }
+
+        def initialize(*args)
+          super
+          self.adaptee ||= Chef::ApiClient.new
+        end
+
+        def self.shared?()              false;  end
+        def self.multiple?()            false;  end
+        def self.resource_type()        :client;                        end
+        def self.expected_ids(computer) [computer.server.fullname];     end
+
+        def self.key_dir
+          Chef::Config.client_key_dir || "/tmp/#{ENV['USER']}-client_keys"
+        end
+
+        def private_key(body=nil)
+          if body.nil?
+            body = File.open(key_filename, "rb").read
+          else
+            File.open(key_filename, "w", 0600){|f| f.print( body ) }
+          end
+          adaptee.private_key(body)
+        end
+
+        #
+        # Discovery
+        #
+        def self.load!(cluster=nil)
+          nameq = "name:#{cluster.name}-* OR clientname:#{cluster.name}-*"
+          ChefServer.search(:client, nameq) do |client|
+            register client unless client.blank?
+          end
+        end
+
+        # 
+        # Manipulation
+        #
+        def self.create!(computer)
+          return if computer.client?
+          client = Client.new
+          client.name         computer.server.fullname
+          client.admin        false
+
+          params = {:name => client.name, :admin => client.admin, :private_key => true }
+          result = ChefServer.post_rest("clients", params)
+          client.private_key(result["private_key"])
+
+          computer[:client] =  client
+          remember             client
+        end
+
+        def self.destroy!(computer)
+          return unless computer.client?
+          forget computer.client.name
+          computer.client.destroy
+          File.delete(computer.client.key_filename)
+          computer.delete(:client)
+        end
+      end
+
+    end
+  end
+end