ironfan 4.3.2 → 4.3.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v4.3.3:
+* Fixed "Terminated machines don't show up even with -VV" (#180)
+* Removing superfluous old steps from cluster_launch
+* Stringification of attributes and in_raid type
+
 # v4.3.2:
 * Adding cluster_name to cluster, to allow consistent semantics whether in cluster or facet
 

data/VERSION

@@ -1 +1 @@
-4.3.2
+4.3.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.3.2"
+  s.version = "4.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-10-03"
+  s.date = "2012-10-10"
   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_launch.rb

@@ -87,7 +87,6 @@ class Chef
           Ironfan.step(computer.name, 'launching', :white)
           perform_after_launch_tasks(computer)
         end
-        # progressbar_for_threads(watcher_threads)
 
         display(target)
       end
@@ -95,22 +94,14 @@ class Chef
       def perform_after_launch_tasks(computer)
         Ironfan.step(computer.name, 'waiting for ready', :white)
         # Wait for machine creation on amazon side
-#         server.fog_server.wait_for{ ready? }
         computer.machine.wait_for{ ready? }
 
         # Try SSH
         unless config[:dry_run]
           Ironfan.step(computer.name, 'trying ssh', :white)
-#           nil until tcp_test_ssh(server.fog_server.dns_name){ sleep @initial_sleep_delay ||= 10  }
           nil until tcp_test_ssh(computer.machine.dns_name){ sleep @initial_sleep_delay ||= 10  }
         end
 
-#         # Make sure our list of volumes is accurate
-#         Ironfan.fetch_fog_volumes
-#         server.discover_volumes!
-
-        # Attach volumes, etc
-#         server.sync_to_cloud
         Ironfan.step(computer.name, 'final provisioning', :white)
         computer.save
 

data/lib/chef/knife/cluster_show.rb

@@ -35,7 +35,7 @@ class Chef
         :boolean     => true
 
       def run
-        with_verbosity(1){ config[:include_terminated] }
+        with_verbosity(1){ config[:include_terminated] = true }
         load_ironfan
         die(banner) if @name_args.empty?
         configure_dry_run

data/lib/ironfan/broker/drive.rb

@@ -10,12 +10,12 @@ module Ironfan
 
       # A drive should include volume attributes in any node references
       def node()
-        result = super
-        result.merge! volume.attributes unless volume.nil?
+        result = super.stringify_keys
+        result.merge! volume.compact_attributes.stringify_keys unless volume.nil?
         result
       end
 
     end
 
   end
-end
+end

data/lib/ironfan/dsl/volume.rb

@@ -10,7 +10,7 @@ module Ironfan
       magic     :device,                String
       magic     :formattable,           :boolean, :default => false
       magic     :fstype,                String,   :default => 'xfs'
-      magic     :in_raid,               :boolean, :default => false
+      magic     :in_raid,               String
       magic     :keep,                  :boolean, :default => true
       magic     :mount_dump,            String
       magic     :mount_pass,            String

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-03 00:00:00 Z
+date: 2012-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3099190191328474460
+      hash: 398445846014237700
       segments: 
       - 0
       version: "0"