ironfan 6.0.9 → 6.1.0

data/ironfan.gemspec

@@ -24,10 +24,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency('unf',        '0.1.3')
   gem.add_dependency('excon',      '0.32.1')
   gem.add_dependency('formatador', '0.2.4')
-  gem.add_dependency('gorillib',   '0.5.0')
+  gem.add_dependency('gorillib',   '~> 0.6.0')
   gem.add_dependency('rbvmomi',    '1.8.1')
   gem.add_dependency('diff-lcs',   '1.2.5')
-  gem.add_dependency('json',       '1.5.4')
 
   gem.add_development_dependency('bundler', '~> 1.0')
 

data/lib/ironfan/dsl/cluster.rb

@@ -42,10 +42,6 @@ module Ironfan
         name
       end
 
-      def full_cluster_name
-        full_name
-      end
-
       def full_name
         "#{realm_name}-#{name}"
       end

data/lib/ironfan/dsl/component.rb

@@ -110,7 +110,7 @@ module Ironfan
         discovery = {discovers: keys.reverse.inject(compute.realm_name){|hsh,key| {key => hsh}}}
         (compute.facet_role || compute.cluster_role).override_attributes(discovery)
 
-        client_group_v = compute.full_cluster_name
+        client_group_v = compute.full_name
         server_group_v = "#{realm_name}-#{server_cluster}"
 
         group_edge(compute, client_group_v, :authorized_by_group, server_group_v)

data/lib/ironfan/dsl/ec2.rb

@@ -325,23 +325,23 @@ Chef::Config[:ec2_flavor_info].merge!({
     '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 => 1, :ebs_optimizable =>  500, },
+    '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_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.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_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.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_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 },
+    '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/dsl/facet.rb

@@ -27,12 +27,8 @@ module Ironfan
         servers.to_a + components.to_a
       end
 
-      def full_cluster_name
-        "#{realm_name}-#{cluster_name}"
-      end
-
       def full_name
-        "#{full_cluster_name}-#{name}"
+        "#{realm_name}-#{cluster_name}-#{name}"
       end
     end
   end

data/lib/ironfan/dsl/server.rb

@@ -170,10 +170,10 @@ module Ironfan
                          hsh.delete(:_type)
                          hsh.delete(:ssh_user)
                          #hsh[:security_groups] = Hash[hsh[:security_groups].map{|x| [x.fetch(:name), x]}]
-                         hsh[:components] = Hash[hsh.fetch(:components).map do |component|
-                                                   [component.fetch(:name), component]
+                         hsh[:components] = Hash[hsh[:components].to_a.map do |component|
+                                                   [component[:name].to_s, component]
                                                  end]
-                         hsh[:run_list] = hsh.fetch(:run_list).map do |x|
+                         hsh[:run_list] = hsh[:run_list].to_a.map do |x|
                            x.end_with?(']') ? x : "recipe[#{x}]"
                          end
                        end)

data/lib/ironfan/dsl/volume.rb

@@ -11,13 +11,6 @@ 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
@@ -31,12 +24,6 @@ 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=, :iops, :merge_attributes, :missing_attributes, :new_record?,
+            :identity=, :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=, :type, :wait_for,
+            :symbolize_keys, :tags, :tags=, :wait_for,
           :to => :adaptee
         field :dsl_volume,        Ironfan::Dsl::Volume
 
@@ -48,7 +48,12 @@ module Ironfan
         #
         # Discovery
         #
-        def self.load!(cluster=nil)
+        def self.load!(cluster = nil)
+          load_once!
+        end
+
+        def self.load_once!
+          return if @loaded
           Ec2.connection.volumes.each do |vol|
             next if vol.blank?
             next if %w[deleting deleted error].include?(vol.state.to_s)
@@ -62,6 +67,7 @@ module Ironfan
               remember ebs
             end
           end
+          @loaded = true
         end
 
         def receive_adaptee(obj)

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

@@ -114,7 +114,12 @@ module Ironfan
         #
         # Discovery
         #
-        def self.load!(cluster=nil)
+        def self.load!(cluster = nil)
+          load_once!
+        end
+
+        def self.load_once!
+          return if @loaded
           Ec2.connection.servers.each do |fs|
             machine = new(:adaptee => fs)
             if (not machine.created?)
@@ -128,6 +133,7 @@ module Ironfan
               remember machine
             end
           end
+          @loaded = true
         end
 
         def receive_adaptee(obj)
@@ -265,14 +271,11 @@ module Ironfan
           end.compact.map(&:name)
 
           if cloud.flavor_info[:placement_groupable]
-            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!")
+            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 }
           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
@@ -293,8 +296,6 @@ 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/provider/ec2/security_group.rb

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

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

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

data/lib/ironfan/version.rb

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

data/spec/ironfan/plugin_spec.rb

@@ -197,7 +197,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).security_group('wap-bam')
+      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).security_group('wap-bam-wak')
       bam_wak_group.group_authorized_by.should include('wap-bop')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.0.9
+  version: 6.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -139,22 +139,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.5
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -332,12 +316,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1983446031386045195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1983446031386045195
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25