ironfan 3.1.6 → 3.1.7

data/VERSION

@@ -1 +1 @@
-3.1.6
+3.1.7

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "3.1.6"
+  s.version = "3.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-06-24"
+  s.date = "2012-07-24"
   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_show.rb

@@ -48,8 +48,9 @@ class Chef
         if config[:verbosity] >= 2
           target.each do |svr|
             Chef::Log.debug( "Server #{svr.name}: #{JSON.pretty_generate(svr.to_hash)}" )
-            Chef::Log.debug( "- cloud: #{JSON.pretty_generate(svr.cloud.to_hash)}" )
-            Chef::Log.debug( "- fog:   #{JSON.pretty_generate(svr.fog_launch_description)}" )
+            Chef::Log.debug( "- volumes: #{JSON.pretty_generate(svr.composite_volumes.values.map(&:to_hash))}" )
+            Chef::Log.debug( "- cloud:   #{JSON.pretty_generate(svr.cloud.to_hash)}" )
+            Chef::Log.debug( "- fog:     #{JSON.pretty_generate(svr.fog_launch_description)}" )
           end
         end
 

data/lib/chef/knife/vagrant/skeleton_vagrantfile.rb

@@ -32,16 +32,16 @@ Vagrant::Config.run do |config|
   # learn more abt vagrant to figure out where.
   #
 
-  # TODO: FIXME: WTF is this hoary horseshit? At *least* do it by cluster-facet, 
+  # TODO: FIXME: WTF is this hoary horseshit? At *least* do it by cluster-facet,
   #   not just facet (especially since the examples given are all *clusters*)
   def ip_for(svr)
     "#{Chef::Config.host_network_base}.#{(Chef::Config.host_network_ip_mapping[svr.facet_name] || 30) + svr.facet_index}"
   end
 
   # FIXME: things like this should be imputed by the `cloud` statement
-  ram_mb           = 640
+  ram_mb           = Chef::Config.vagrant_ram_mb || 640
   video_ram_mb     = 10
-  cores            = 2
+  cores            = Chef::Config.vagrant_cores  || 2
 
   # ===========================================================================
   #

data/lib/ironfan/chef_layer.rb

@@ -192,7 +192,6 @@ module Ironfan
       end
     end
 
-
     def sync_volume_attributes
       composite_volumes.each do |vol_name, vol|
         chef_node.normal[:volumes] ||= Mash.new
@@ -203,11 +202,11 @@ module Ironfan
     def set_chef_node_attributes
       step("  setting node runlist and essential attributes")
       @chef_node.run_list = Chef::RunList.new(*@settings[:run_list])
-      @chef_node.normal[:organization]   = organization if organization
-      @chef_node.normal[:permanent]      = cloud.permanent if cloud.permanent
-      @chef_node.override[:cluster_name] = cluster_name
-      @chef_node.override[:facet_name]   = facet_name
-      @chef_node.override[:facet_index]  = facet_index
+      @chef_node.normal[:organization] = organization if organization
+      @chef_node.normal[:permanent]    = cloud.permanent if cloud.permanent
+      @chef_node.normal[:cluster_name] = cluster_name
+      @chef_node.normal[:facet_name]   = facet_name
+      @chef_node.normal[:facet_index]  = facet_index
     end
 
     def set_chef_node_environment

data/lib/ironfan/server.rb

@@ -197,6 +197,10 @@ module Ironfan
     #
     def composite_volumes
       vols = {}
+      self.volumes.each do |vol_name, vol|
+        vols[vol_name]         ||= self.volumes[vol_name].dup
+        vols[vol_name].reverse_merge!(vol)
+      end
       facet.volumes.each do |vol_name, vol|
         self.volumes[vol_name] ||= Ironfan::Volume.new(:parent => self, :name => vol_name)
         vols[vol_name]         ||= self.volumes[vol_name].dup

data/lib/ironfan/volume.rb

@@ -28,6 +28,7 @@ module Ironfan
       :formattable      => false,
       :in_raid          => false,
     }
+    def self.defaults(hsh) VOLUME_DEFAULTS.merge(hsh) ; end
 
     # Snapshot for snapshot_name method.
     # Set your own by adding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70096497952380 !ruby/object:Gem::Requirement
+  requirement: &70201801398780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70096497952380
+  version_requirements: *70201801398780
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70096497951860 !ruby/object:Gem::Requirement
+  requirement: &70201801398300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70096497951860
+  version_requirements: *70201801398300
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70096497951280 !ruby/object:Gem::Requirement
+  requirement: &70201801397280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70096497951280
+  version_requirements: *70201801397280
 - !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &70096497950680 !ruby/object:Gem::Requirement
+  requirement: &70201801396800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70096497950680
+  version_requirements: *70201801396800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70096497950160 !ruby/object:Gem::Requirement
+  requirement: &70201801396320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70096497950160
+  version_requirements: *70201801396320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70096497949600 !ruby/object:Gem::Requirement
+  requirement: &70201801395840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70096497949600
+  version_requirements: *70201801395840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096497949080 !ruby/object:Gem::Requirement
+  requirement: &70201801395360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70096497949080
+  version_requirements: *70201801395360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70096497948540 !ruby/object:Gem::Requirement
+  requirement: &70201801394880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70096497948540
+  version_requirements: *70201801394880
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70096497947960 !ruby/object:Gem::Requirement
+  requirement: &70201801394400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70096497947960
+  version_requirements: *70201801394400
 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.
 email: coders@infochimps.com
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 237204052974286677
+      hash: 2550767254429275141
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: