ironfan 6.0.8 → 6.0.9

data/lib/ironfan/dsl/ec2.rb

@@ -329,19 +329,19 @@ Chef::Config[:ec2_flavor_info].merge!({
     'm2.4xlarge'  => { :price => 1.640, :bits => 64, :ram => 70042, :cores => 8, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>  840, :ephemeral_volumes => 2, :ebs_optimizable => 1000, },
     'cc2.8xlarge' => { :price => 2.400, :bits => 64, :ram =>  61952, :cores =>32, :core_size => 2.75, :inst_disks => 4, :inst_disk_size =>  840, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm' },
     'cg1.4xlarge' => { :price => 2.100, :bits => 64, :ram =>  23040, :cores =>16, :core_size => 2.09375, :inst_disks => 2, :inst_disk_size =>  840, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
-    'c3.large'    => { :price => 0.150, :bits => 64, :ram =>   3840, :cores => 2, :core_size => 3.5,  :inst_disks => 2, :inst_disk_size =>  16, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
-    'c3.xlarge'   => { :price => 0.300, :bits => 64, :ram =>   7680, :cores => 4, :core_size => 3.5,  :inst_disks => 2, :inst_disk_size =>   40, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
-    'c3.2xlarge'  => { :price => 0.600, :bits => 64, :ram =>  15360, :cores => 8, :core_size => 3.5, :inst_disks => 2, :inst_disk_size =>  80, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
-    'c3.4xlarge'  => { :price => 1.200, :bits => 64, :ram =>  30720, :cores => 16, :core_size => 3.4375, :inst_disks => 2, :inst_disk_size =>  160, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'c3.large'    => { :price => 0.150, :bits => 64, :ram =>   3840, :cores => 2, :core_size => 3.5,  :inst_disks => 2, :inst_disk_size =>  16, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
+    'c3.xlarge'   => { :price => 0.300, :bits => 64, :ram =>   7680, :cores => 4, :core_size => 3.5,  :inst_disks => 2, :inst_disk_size =>   40, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
+    'c3.2xlarge'  => { :price => 0.600, :bits => 64, :ram =>  15360, :cores => 8, :core_size => 3.5, :inst_disks => 2, :inst_disk_size =>  80, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
+    'c3.4xlarge'  => { :price => 1.200, :bits => 64, :ram =>  30720, :cores => 16, :core_size => 3.4375, :inst_disks => 2, :inst_disk_size =>  160, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
     'c3.8xlarge'  => { :price => 2.400, :bits => 64, :ram =>  61440, :cores => 32, :core_size => 3.375, :inst_disks => 2, :inst_disk_size =>  320, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
     'hs1.8xlarge' => { :price => 4.600, :bits => 64, :ram => 119808, :cores => 16, :core_size => 2.1875, :inst_disks => 24, :inst_disk_size =>  2048, :ephemeral_volumes => 24, :placement_groupable => true, :virtualization => 'hvm' },
     'cr1.8xlarge' =>  { :price => 3.500, :bits => 64, :ram => 249856, :cores => 32, :core_size => 2.75, :inst_disks => 2, :inst_disk_size =>  120, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
-    'i2.xlarge'   =>  { :price => 0.853, :bits => 64, :ram => 31232, :cores => 4, :core_size => 3.5, :inst_disks => 1, :inst_disk_size =>  800, :ephemeral_volumes => 1, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized =>  500 },
-    'i2.2xlarge'  =>  { :price => 1.705, :bits => 64, :ram => 62464, :cores => 8, :core_size => 3.375, :inst_disks => 2, :inst_disk_size =>  800, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized => 1000 },
-    'i2.4xlarge'  =>  { :price => 3.410, :bits => 64, :ram => 124928, :cores => 16, :core_size => 3.3125, :inst_disks => 4, :inst_disk_size =>  800, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized => 1000 },
+    'i2.xlarge'   =>  { :price => 0.853, :bits => 64, :ram => 31232, :cores => 4, :core_size => 3.5, :inst_disks => 1, :inst_disk_size =>  800, :ephemeral_volumes => 1, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable =>  500 },
+    'i2.2xlarge'  =>  { :price => 1.705, :bits => 64, :ram => 62464, :cores => 8, :core_size => 3.375, :inst_disks => 2, :inst_disk_size =>  800, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
+    'i2.4xlarge'  =>  { :price => 3.410, :bits => 64, :ram => 124928, :cores => 16, :core_size => 3.3125, :inst_disks => 4, :inst_disk_size =>  800, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
     'i2.8xlarge'  =>  { :price => 6.820, :bits => 64, :ram => 249856, :cores => 32, :core_size => 3.25, :inst_disks => 8, :inst_disk_size =>  800, :ephemeral_volumes => 8, :placement_groupable => true, :virtualization => 'hvm' },
-    'g2.2xlarge'  =>  { :price => 0.650, :bits => 64, :ram => 15360, :cores => 8, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>   60, :ephemeral_volumes => 1, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized => 1000 },
-    'hi1.4xlarge' =>  { :price => 3.100, :bits => 64, :ram => 61952, :cores => 16, :core_size => 2.1875, :inst_disks => 2, :inst_disk_size =>  1024, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized => 1000 },
+    'g2.2xlarge'  =>  { :price => 0.650, :bits => 64, :ram => 15360, :cores => 8, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>   60, :ephemeral_volumes => 1, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
+    'hi1.4xlarge' =>  { :price => 3.100, :bits => 64, :ram => 61952, :cores => 16, :core_size => 2.1875, :inst_disks => 2, :inst_disk_size =>  1024, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimizable => 1000 },
   })
 
 Chef::Config[:ec2_image_info] ||= {}

data/lib/ironfan/dsl/volume.rb

@@ -11,6 +11,13 @@ module Ironfan
       magic     :formattable,           :boolean, :default => false
       magic     :fstype,                String,   :default => 'xfs'
       magic     :in_raid,               String
+
+      # The number of I/O operations per second (IOPS) that the volume supports.
+      # valid range: 500-4000
+      # Only Provisioned IOPS (SSD, type io1) drives support
+      # this. These volumes should be with EBS-optimized machines.
+      magic     :iops,                  Integer
+
       magic     :keep,                  :boolean, :default => true
       magic     :mount_dump,            String
       magic     :mount_pass,            String
@@ -24,6 +31,12 @@ module Ironfan
       magic     :snapshot_name,         String
       magic     :tags,                  Hash,     :default => {}
 
+      # valid types:
+      #   gp2 = General Purpose 2
+      #   io1 = Provisioned IOPS
+      #   standard = Magnetic volumes
+      magic     :type,                  String
+
       VOLUME_IDS ||= {}
       VOLUME_IDS.merge!({
                             :blank_xfs             => 'snap-d9c1edb1',

data/lib/ironfan/provider/ec2/ebs_volume.rb

@@ -8,11 +8,11 @@ module Ironfan
             :connection, :connection=, :created_at, :created_at=,
             :delete_on_termination, :delete_on_termination=, :destroy, :device,
             :device=, :dup_attributes!, :force_detach, :id, :id=, :identity,
-            :identity=, :merge_attributes, :missing_attributes, :new_record?,
+            :identity=, :iops, :merge_attributes, :missing_attributes, :new_record?,
             :ready?, :reload, :requires, :requires_one, :save, :server,
             :server=, :server_id, :server_id=, :size, :size=, :snapshot,
             :snapshot_id, :snapshot_id=, :snapshots, :state, :state=,
-            :symbolize_keys, :tags, :tags=, :wait_for,
+            :symbolize_keys, :tags, :tags=, :type, :wait_for,
           :to => :adaptee
         field :dsl_volume,        Ironfan::Dsl::Volume
 

data/lib/ironfan/provider/ec2/machine.rb

@@ -265,11 +265,14 @@ module Ironfan
           end.compact.map(&:name)
 
           if cloud.flavor_info[:placement_groupable]
-            ui.warn "1.3.1 and earlier versions of Fog don't correctly support placement groups, so your nodes will land willy-nilly. We're working on a fix"
-            description[:placement] = { 'groupName' => cloud.placement_group.to_s }
+            description[:placement_group] = cloud.placement_group.to_s
+          elsif cloud.placement_group
+            Chef::Application.fatal!("A placement group was set but #{cloud.flavor} does not support placement!")
           end
           if cloud.flavor_info[:ebs_optimizable]
             description[:ebs_optimized] = cloud.ebs_optimized
+          elsif cloud.ebs_optimized
+            Chef::Application.fatal!("ebs_optimized set but #{cloud.flavor} does not support ebs optimization!")
           end
           description
         end
@@ -290,6 +293,8 @@ module Ironfan
               end
               hsh['Ebs.SnapshotId'] = volume.snapshot_id if volume.snapshot_id.present?
               hsh['Ebs.VolumeSize'] = volume.size.to_s   if volume.size.present?
+              hsh['Ebs.VolumeType'] = volume.type        if volume.type.present?
+              hsh['Ebs.Iops']       = volume.iops        if volume.type == 'io1'
               hsh['Ebs.DeleteOnTermination'] = (not volume.keep).to_s
             else next
             end

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.0.8'
+  VERSION = '6.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 6.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -332,18 +332,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 770393223121845941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 770393223121845941
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25