ironfan 5.0.8 → 5.0.10

data/Rakefile

@@ -68,10 +68,10 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/{ironfan,chef,ironfan/*}/*_spec.rb'
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary ]
+desc 'Run :spec task with coverage using Simplecov'
+task :coverage do
+  ENV['IRONFAN_COV'] = 'true'
+  Rake::Task[:spec].invoke
 end
 
 RSpec::Core::RakeTask.new(:integration) do |spec|

data/VERSION

@@ -1 +1 @@
-5.0.8
+5.0.10

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "5.0.8"
+  s.version = "5.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2014-01-16"
+  s.date = "2014-02-20"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan/dsl/component.rb

@@ -81,6 +81,7 @@ module Ironfan
 
       magic :server_cluster, Symbol
       magic :bidirectional, :boolean, default: false
+      magic :create_security_groups, :boolean, default: true
 
       (@_dependencies ||= []) << Gorillib::Builder
 
@@ -88,6 +89,9 @@ module Ironfan
         def default_to_bidirectional default=true
           magic :bidirectional, :boolean, default: default
         end
+        def default_create_security_groups default=true
+          magic :create_security_groups, :boolean, default: default
+        end
       end
 
       def set_discovery compute, keys
@@ -110,8 +114,10 @@ module Ironfan
         client_group_v = client_group(compute)
         server_group_v = security_group(full_server_cluster_v)
 
-        group_edge(compute.cloud(:ec2), client_group_v, :authorized_by_group, server_group_v)
-        group_edge(compute.cloud(:ec2), client_group_v, :authorize_group,     server_group_v) if bidirectional
+        if create_security_groups
+          group_edge(compute.cloud(:ec2), client_group_v, :authorized_by_group, server_group_v)
+          group_edge(compute.cloud(:ec2), client_group_v, :authorize_group,     server_group_v) if bidirectional
+        end
 
         Chef::Log.debug("discovered #{announce_name} for #{cluster_name}: #{discovery}")
       end

data/lib/ironfan/dsl/ec2.rb

@@ -328,19 +328,31 @@ Chef::Config[:ec2_flavor_info].merge!({
     'm1.small'    => { :price => 0.08,  :bits => 64, :ram =>   1740, :cores => 1, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  160, :ephemeral_volumes => 1 },
     'm1.medium'   => { :price => 0.165, :bits => 64, :ram =>   3840, :cores => 2, :core_size => 1,    :inst_disks => 1, :inst_disk_size =>  410, :ephemeral_volumes => 1 },
     'c1.medium'   => { :price => 0.17,  :bits => 64, :ram =>   1740, :cores => 2, :core_size => 2.5,  :inst_disks => 1, :inst_disk_size =>  350, :ephemeral_volumes => 1 },
-    #
+    'm3.medium'   => { :price => 0.113, :bits => 64, :ram =>   3840, :cores => 1, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>    4, :ephemeral_volumes => 1, :ebs_optimizable =>  500, },
     'm1.large'    => { :price => 0.32,  :bits => 64, :ram =>   7680, :cores => 2, :core_size => 2,    :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2, :ebs_optimizable =>  500, },
-    'm2.xlarge'   => { :price => 0.45,  :bits => 64, :ram =>  18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1, },
-    'm3.xlarge'   => { :price => 0.50,  :bits => 64, :ram =>  15360, :cores => 4, :core_size => 3.25, :inst_disks => 0, :inst_disk_size =>  0,   :ephemeral_volumes => 0, :ebs_optimizable =>  500, },
+    'm3.large'    => { :price => 0.225, :bits => 64, :ram =>   7680, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>   32, :ephemeral_volumes => 0, :ebs_optimizable =>  500, },
+    'm2.xlarge'   => { :price => 0.41,  :bits => 64, :ram =>  18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1, },
+    'm3.xlarge'   => { :price => 0.45,  :bits => 64, :ram =>  15360, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>   40, :ephemeral_volumes => 2, :ebs_optimizable =>  500, },
     'c1.xlarge'   => { :price => 0.64,  :bits => 64, :ram =>   7168, :cores => 8, :core_size => 2.5,  :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
     'm1.xlarge'   => { :price => 0.66,  :bits => 64, :ram =>  15360, :cores => 4, :core_size => 2,    :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
-    'm3.2xlarge'  => { :price => 1.00,  :bits => 64, :ram =>  30720, :cores => 8, :core_size => 3.25, :inst_disks => 0, :inst_disk_size =>  0,   :ephemeral_volumes => 0, :ebs_optimizable => 1000, },
+    'm3.2xlarge'  => { :price => 0.90,  :bits => 64, :ram =>  30720, :cores => 8, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>   80, :ephemeral_volumes => 2, :ebs_optimizable => 1000, },
     'm2.2xlarge'  => { :price => 0.90,  :bits => 64, :ram =>  35020, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size =>  850, :ephemeral_volumes => 2, :ebs_optimizable =>  500, },
     'm2.4xlarge'  => { :price => 1.80,  :bits => 64, :ram =>  70041, :cores => 8, :core_size => 3.25, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
     'cc1.4xlarge' => { :price => 1.30,  :bits => 64, :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, :ram =>  61952, :cores =>16, :core_size => 5.50, :inst_disks => 8, :inst_disk_size => 3370, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm' },
-    'cc2.8xlarge' => { :price => 2.40,  :bits => 64, :ram =>  61952, :cores =>16, :core_size => 5.50, :inst_disks => 8, :inst_disk_size => 3370, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm' },
+    'cc2.8xlarge' => { :price => 2.40,  :bits => 64, :ram =>  61952, :cores =>32, :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, :ram =>  22528, :cores => 8, :core_size => 4.19, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
+    'c3.large'    =>  { :price => 0.15, :bits => 64, :ram =>   3840, :cores => 2, :core_size => 6.50, :inst_disks => 2, :inst_disk_size =>   16, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'c3.xlarge'   =>  { :price => 0.30, :bits => 64, :ram =>   7168, :cores => 4, :core_size => 6.50, :inst_disks => 2, :inst_disk_size =>   40, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'c3.2xlarge'  =>  { :price => 0.60, :bits => 64, :ram =>  15360, :cores => 8, :core_size => 6.50, :inst_disks => 2, :inst_disk_size =>   80, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'c3.4xlarge'  =>  { :price => 1.20, :bits => 64, :ram =>  30720, :cores =>16, :core_size => 6.50, :inst_disks => 2, :inst_disk_size =>  160, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_opizable => 1000 },
+    'c3.8xlarge'  =>  { :price => 2.40, :bits => 64, :ram =>  30720, :cores =>32, :core_size => 6.50, :inst_disks => 2, :inst_disk_size =>  320, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
+    'hs1.8xlarge' =>  { :price => 4.60, :bits => 64, :ram => 119808, :cores => 8, :core_size => 5.50, :inst_disks =>24, :inst_disk_size => 2048, :ephemeral_volumes =>24, :placement_groupable => true, :virtualization => 'hvm' },
+    'cr1.8xlarge' =>  { :price => 3.50, :bits => 64, :ram => 249856, :cores =>32, :core_size => 6.50, :inst_disks => 2, :inst_disk_size =>  120, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
+    'i2.xlarge'   =>  { :price => 0.85, :bits => 64, :ram =>  31232, :cores => 4, :core_size => 3.50, :inst_disks => 1, :inst_disk_size =>  800, :ephemeral_volumes => 1, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized =>  500 },
+    'i2.2xlarge'  =>  { :price => 1.71, :bits => 64, :ram =>  62464, :cores => 8, :core_size => 3.50, :inst_disks => 2, :inst_disk_size =>  800, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized => 1000 },
+    'i2.4xlarge'  =>  { :price => 3.41, :bits => 64, :ram => 124928, :cores =>16, :core_size => 3.50, :inst_disks => 4, :inst_disk_size =>  800, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm', :ebs_optimized => 1000 },
+    'i2.8xlarge'  =>  { :price => 6.82, :bits => 64, :ram => 249856, :cores =>32, :core_size => 3.50, :inst_disks => 8, :inst_disk_size =>  800, :ephemeral_volumes => 8, :placement_groupable => true, :virtualization => 'hvm' },
+    'g2.2xlarge'  =>  { :price => 0.65, :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 },
   })
 
 Chef::Config[:ec2_image_info] ||= {}

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
 $:.unshift File.expand_path('../../lib', __FILE__)
+if ENV['IRONFAN_COV']
+  require 'simplecov'
+  SimpleCov.start
+end
 require 'chef'
 require 'chef/knife'
 require 'ironfan'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef