ironfan 6.0.6 → 6.0.7

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.5.2')
   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/chef/knife/ironfan_knife_common.rb

@@ -40,37 +40,37 @@ module Ironfan
       "Gemfile.#{realm_or_cluster_name}"
     end
 
+
+    #
+    # Common code for calling broker.discover with an appropriately
+    # trimmed list of clusters to discover.
+    #
+    def discover_computers(realm_name, cluster_name, facet_name, slice_indexes)
+      realm = Ironfan.load_realm(realm_name)
+      realm.clusters.each{ |cluster| Ironfan.load_cluster cluster.name }
+      realm.resolve!
+      clusters = cluster_name ? Array(realm.clusters[cluster_name.to_sym]) : realm.clusters.to_a
+      return broker.discover!(clusters, config[:cloud])
+    end
+
     #
     # A slice of a cluster:
     #
-    # @param [String] cluster_name  -- cluster to slice
-    # @param [String] facet_name    -- facet to slice (or nil for all in cluster)
-    # @param [Array, String] slice_indexes -- servers in that facet (or nil for all in facet).
-    #   You must specify a facet if you use slice_indexes.
     #
     # @return [Ironfan::ServerSlice] the requested slice
     def get_slice(slice_string, *args)
       realm_name, cluster_name, facet_name, slice_indexes = pick_apart(slice_string, *args)
       desc = predicate_str(realm_name, cluster_name, facet_name, slice_indexes)
-      #
       ui.info("Inventorying servers in #{desc}")
-      realm = Ironfan.load_realm(realm_name)
-      realm.clusters.each{ |cluster| Ironfan.load_cluster cluster.name }
-      realm.resolve!
-      Chef::Config[:knife][:region] = realm.clusters.to_a.first.servers.to_a.first.cloud(:ec2).region
-      computers = broker.discover!(realm.clusters.to_a, config[:cloud])
-      Chef::Log.info("Inventoried #{computers.size} computers")
-      #
-      computers.slice(cluster_name, facet_name, slice_indexes)
+      computers = discover_computers(realm_name, cluster_name, facet_name, slice_indexes)
+      
+      Chef::Log.info("Inventoried #{computers.size} computers")      
+      return computers.slice(cluster_name, facet_name, slice_indexes)
     end
 
     def all_computers(slice_string, *args)
       realm_name, cluster_name, facet_name, slice_indexes = pick_apart(slice_string, *args)
-      realm = Ironfan.load_realm(realm_name)
-      realm.clusters.each{ |cluster| Ironfan.load_cluster cluster.name }
-      realm.resolve!
-      clusters = cluster_name ? Array(realm.clusters[cluster_name.to_sym]) : realm.clusters.to_a
-      computers = broker.discover!(clusters, config[:cloud])
+      computers = discover_computers(realm_name, cluster_name, facet_name, slice_indexes)
       ui.info("Loaded information for #{computers.size} computer(s) in cluster #{cluster_name}")
       computers
     end

data/lib/ironfan/broker.rb

@@ -13,11 +13,17 @@ module Ironfan
     #   unrecognizable resources are labeled as bogus.
     def discover!(clusters, with_cloud = true)
 
+      
       # Get fully resolved servers, and build Computers using them
       computers = Computers.new(clusters: Array(clusters))
       #      
       if with_cloud
         providers = computers.map{|c| c.providers.values }.flatten.uniq
+
+        providers.each do |p|
+          p.forget!
+        end
+
         Ironfan.parallel(providers) do |provider|
           clusters.each do |cluster|
             Ironfan.step cluster.name, "Loading #{provider.handle}", :cyan

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/provider.rb

@@ -35,13 +35,19 @@ module Ironfan
     def self.load(cluster)
       Ironfan.parallel (resources) do |r|
         type = r.resource_type.to_s
-        r.forget!
         Ironfan.substep(cluster.name, "loading #{type}s")
         r.load! cluster
         Ironfan.substep(cluster.name, "loaded #{type}s")
       end
     end
 
+
+    def self.forget!()
+      resources.each do |r|
+        r.forget!
+      end
+    end
+
     def self.validate(computers)
       resources.each {|r| r.validate_resources! computers }
     end
@@ -242,6 +248,7 @@ bootcmd:
 #{computer.private_key.split("\n").map {|l| "      "+l}.join("\n")}
       EOF
       domainname #{computer.server.fqdn}
+      IP=`curl 169.254.169.254/latest/meta-data/local-ipv4`;sed -i -e "s/127\.0\.1\.1/$IP/" /etc/cloud/templates/hosts.tmpl
  
 chef:
  install_type: "packages"

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

@@ -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)

data/lib/ironfan/version.rb

@@ -1,3 +1,3 @@
 module Ironfan
-  VERSION = '6.0.6'
+  VERSION = '6.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-03 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.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !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
@@ -334,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4541448457193687507
+      hash: 2994755977680562733
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -343,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4541448457193687507
+      hash: 2994755977680562733
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25