ironfan 5.0.10 → 5.0.11

data/Rakefile

@@ -68,10 +68,10 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/{ironfan,chef,ironfan/*}/*_spec.rb'
 end
 
-desc 'Run :spec task with coverage using Simplecov'
-task :coverage do
-  ENV['IRONFAN_COV'] = 'true'
-  Rake::Task[:spec].invoke
+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 ]
 end
 
 RSpec::Core::RakeTask.new(:integration) do |spec|

data/VERSION

@@ -1 +1,2 @@
-5.0.10
+5.0.11
+

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "5.0.10"
+  s.version = "5.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2014-02-20"
+  s.date = "2014-04-02"
   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/chef/knife/cluster_ssh.rb

@@ -53,17 +53,13 @@ class Chef
 
         (ui.fatal("No nodes returned from search!"); exit 10) if addresses.nil? || addresses.length == 0
 
-        # Need to include both public host and public ip; sometimes these are different
-        @hostname_to_ironfan_hostname = target.to_a.inject({}) do |remap, c|
-          remap[c.machine.public_hostname]   = c.machine.tags['Name']
-          remap[c.machine.public_ip_address] = c.machine.tags['Name']
-          remap
-        end
-
+        @hostname_to_ironfan_hostname = Hash[
+          target.map do |c|
+            [c.machine.public_hostname, c.machine.tags['Name']]
+          end
+        ]
         @longest_ironfan_hostname = @hostname_to_ironfan_hostname.values.group_by(&:size).max.last[0].size
 
-        @action_nodes = Chef::Search::Query.new.search(:node, "node_name:#{@name_args[0]}*")[0]
-
         session_from_list(addresses)
       end
 

data/lib/ironfan/dsl/component.rb

@@ -125,7 +125,7 @@ module Ironfan
       protected
 
       def client_group(compute)
-        security_group(compute.cluster_name, (compute.name if compute.is_a?(Facet)))
+        security_group(compute.cluster_name)
       end
       
       def full_server_cluster

data/lib/ironfan/dsl/ec2.rb

@@ -321,38 +321,51 @@ module Ironfan
   end
 end
 
+#
+# aws ec2 flavor info: details on ec2 linux instances in us-east
+#
+# instance details from http://aws.amazon.com/ec2/instance-types/
+# pricing from http://aws.amazon.com/ec2/pricing/
+# 
+# some notes on attributes:
+#   price: cost per hour in US dollars as of 12 March 2014
+#   ram:   instance RAM in MiB
+#   cores: number of vCPUs
+#   core_size: ECU / vCPU
+
+
 Chef::Config[:ec2_flavor_info] ||= {}
 Chef::Config[:ec2_flavor_info].merge!({
     # 32-or-64: m1.small, m1.medium, t1.micro, c1.medium
-    't1.micro'    => { :price => 0.02,  :bits => 64, :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, :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, },
-    '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 => 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' },
-    '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 },
+    't1.micro'    => { :price => 0.02,  :bits => 64, :ram => 630, :cores => 1, :core_size => 0.25, :inst_disks => 0, :inst_disk_size =>    0, :ephemeral_volumes => 0 },
+    'm1.small'    => { :price => 0.06,  :bits => 64, :ram => 1741, :cores => 1, :core_size => 1.0,  :inst_disks => 1, :inst_disk_size =>  160, :ephemeral_volumes => 1 },
+    'm1.medium'   => { :price => 0.120, :bits => 64, :ram => 3840, :cores => 1, :core_size => 2.0,  :inst_disks => 1, :inst_disk_size =>  410, :ephemeral_volumes => 1 },
+    'c1.medium'   => { :price => 0.145, :bits => 64, :ram => 1741, :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.0,  :inst_disks => 1, :inst_disk_size =>    4, :ephemeral_volumes => 1, :ebs_optimizable =>  500, },
+    'm1.large'    => { :price => 0.240, :bits => 64, :ram => 7680, :cores => 2, :core_size => 2.0,  :inst_disks => 2, :inst_disk_size =>  420, :ephemeral_volumes => 2, :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.410, :bits => 64, :ram => 17510, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  420, :ephemeral_volumes => 1 },
+    'm3.xlarge'   => { :price => 0.450, :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.580, :bits => 64, :ram => 7168, :cores => 8, :core_size => 2.5,  :inst_disks => 4, :inst_disk_size =>  420, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
+    'm1.xlarge'   => { :price => 0.480, :bits => 64, :ram => 15360, :cores => 4, :core_size => 2.0, :inst_disks => 4, :inst_disk_size =>  420, :ephemeral_volumes => 4, :ebs_optimizable => 1000, },
+    'm3.2xlarge'  => { :price => 0.900, :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.820, :bits => 64, :ram => 35021, :cores => 4, :core_size => 3.25, :inst_disks => 1, :inst_disk_size =>  850, :ephemeral_volumes => 2, :ebs_optimizable =>  500, },
+    '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.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.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 },
   })
 
 Chef::Config[:ec2_image_info] ||= {}

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

@@ -189,8 +189,6 @@ module Ironfan
           cloud = computer.server.cloud(:ec2)
           c_group = cloud.security_group(computer.server.cluster_name)
           c_group.authorized_by_group(c_group.name)
-          facet_name = "#{computer.server.cluster_name}-#{computer.server.facet_name}"
-          cloud.security_group(facet_name)
         end
 
         # Try an authorization, ignoring duplicates (this is easier than correlating).

data/spec/ironfan/plugin_spec.rb

@@ -182,7 +182,7 @@ describe Ironfan::Dsl::Component do
     end
 
     it 'correctly sets the server cluster even when the client and server facets differ' do
-      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).cloud(:ec2).security_group('wap_bam-wak')
+      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).cloud(:ec2).security_group('wap_bam')
       bam_wak_group.group_authorized_by.should include('wap_bop')
     end
 

data/spec/spec_helper.rb

@@ -1,8 +1,4 @@
 $:.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.10
+  version: 5.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -408,6 +408,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3889852725831803643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -450,4 +453,3 @@ test_files:
 - spec/spec_helper/dummy_diff_drawer.rb
 - spec/spec_helper.rb
 - spec/test_config.rb
-has_rdoc: