ironfan 6.0.7 → 6.0.8

data/ironfan.gemspec

@@ -24,9 +24,10 @@ 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.2')
+  gem.add_dependency('gorillib',   '0.5.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,6 +42,10 @@ 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_name
+        client_group_v = compute.full_cluster_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,7 +325,7 @@ 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 => 2, :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 => 1, :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' },

data/lib/ironfan/dsl/facet.rb

@@ -27,8 +27,12 @@ module Ironfan
         servers.to_a + components.to_a
       end
 
+      def full_cluster_name
+        "#{realm_name}-#{cluster_name}"
+      end
+
       def full_name
-        "#{realm_name}-#{cluster_name}-#{name}"
+        "#{full_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[:components].to_a.map do |component|
-                                                   [component[:name].to_s, component]
+                         hsh[:components] = Hash[hsh.fetch(:components).map do |component|
+                                                   [component.fetch(:name), component]
                                                  end]
-                         hsh[:run_list] = hsh[:run_list].to_a.map do |x|
+                         hsh[:run_list] = hsh.fetch(:run_list).map do |x|
                            x.end_with?(']') ? x : "recipe[#{x}]"
                          end
                        end)

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

@@ -48,12 +48,7 @@ module Ironfan
         #
         # Discovery
         #
-        def self.load!(cluster = nil)
-          load_once!
-        end
-
-        def self.load_once!
-          return if @loaded
+        def self.load!(cluster=nil)
           Ec2.connection.volumes.each do |vol|
             next if vol.blank?
             next if %w[deleting deleted error].include?(vol.state.to_s)
@@ -67,7 +62,6 @@ module Ironfan
               remember ebs
             end
           end
-          @loaded = true
         end
 
         def receive_adaptee(obj)

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

@@ -114,12 +114,7 @@ module Ironfan
         #
         # Discovery
         #
-        def self.load!(cluster = nil)
-          load_once!
-        end
-
-        def self.load_once!
-          return if @loaded
+        def self.load!(cluster=nil)
           Ec2.connection.servers.each do |fs|
             machine = new(:adaptee => fs)
             if (not machine.created?)
@@ -133,7 +128,6 @@ module Ironfan
               remember machine
             end
           end
-          @loaded = true
         end
 
         def receive_adaptee(obj)

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

@@ -204,8 +204,6 @@ 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,8 +192,6 @@ 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.7'
+  VERSION = '6.0.8'
 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-wak')
+      bam_wak_group = Ironfan.realm(:wap).cluster(:bam).facet(:wak).security_group('wap-bam')
       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.7
+  version: 6.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-24 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.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,22 @@ 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
@@ -318,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2994755977680562733
+      hash: 770393223121845941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2994755977680562733
+      hash: 770393223121845941
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25