cluster_chef 3.0.8 → 3.0.9

data/README.md

@@ -212,8 +212,7 @@ to the chef server. (see below for details).
 Hooray! You're ready to launch a cluster:
 
 ```ruby
-    knife cluster launch demosimple homebase --bootstrap
-</pre>
+    knife cluster launch demosimple homebase --bootstrap```
 
 It will kick off a node and then bootstrap it. You'll see it install a whole bunch of things. Yay.
 

data/VERSION

@@ -1 +1 @@
-3.0.8
+3.0.9

data/cluster_chef.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cluster_chef"
-  s.version = "3.0.8"
+  s.version = "3.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2011-12-14"
+  s.date = "2011-12-16"
   s.description = "cluster_chef 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 = [
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<yard>, ["~> 0.6"])
       s.add_development_dependency(%q<configliere>, ["~> 0.4.8"])
-      s.add_runtime_dependency(%q<cluster_chef-knife>, ["= 3.0.8"])
+      s.add_runtime_dependency(%q<cluster_chef-knife>, ["= 3.0.9"])
     else
       s.add_dependency(%q<chef>, ["~> 0.10.4"])
       s.add_dependency(%q<fog>, ["~> 1.1.1"])
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<yard>, ["~> 0.6"])
       s.add_dependency(%q<configliere>, ["~> 0.4.8"])
-      s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.8"])
+      s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.9"])
     end
   else
     s.add_dependency(%q<chef>, ["~> 0.10.4"])
@@ -106,7 +106,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<yard>, ["~> 0.6"])
     s.add_dependency(%q<configliere>, ["~> 0.4.8"])
-    s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.8"])
+    s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.9"])
   end
 end
 

data/lib/cluster_chef.rb

@@ -1,4 +1,6 @@
 require 'chef/mash'
+require 'chef/config'
+#
 require 'gorillib/metaprogramming/class_attribute'
 require 'gorillib/hash/reverse_merge'
 require 'gorillib/object/blank'

data/lib/cluster_chef/compute.rb

@@ -116,7 +116,7 @@ module ClusterChef
 
     # run list elements grouped into :first, :normal and :last
     def run_list_groups
-      @run_list_info.keys.sort_by{|item| @run_list_info[:rank] }.group_by{|item| @run_list_info[item][:placement] }
+      @run_list_info.keys.sort_by{|item| @run_list_info[item][:rank] }.group_by{|item| @run_list_info[item][:placement] }
     end
 
     #

data/lib/cluster_chef/discovery.rb

@@ -116,7 +116,11 @@ module ClusterChef
     def discover_addresses!
       servers.each(&:discover_addresses!)
     end
-  end
+
+  end # ClusterChef::Cluster
+end
+
+module ClusterChef
 
   def self.fog_connection
     @fog_connection ||= Fog::Compute.new({
@@ -133,18 +137,21 @@ module ClusterChef
     @fog_servers = ClusterChef.fog_connection.servers.all
   end
 
-  def self.fog_volumes
-    return @fog_volumes if @fog_volumes
-    Chef::Log.debug("Using fog to catalog all volumes")
-    @fog_volumes ||= ClusterChef.fog_connection.volumes
-  end
-
   def self.fog_addresses
     return @fog_addresses if @fog_addresses
     Chef::Log.debug("Using fog to catalog all addresses")
     @fog_addresses = {}.tap{|hsh| ClusterChef.fog_connection.addresses.each{|fa| hsh[fa.public_ip] = fa } }
   end
 
+  def self.fog_volumes
+    @fog_volumes || fetch_fog_volumes
+  end
+
+  def self.fetch_fog_volumes
+    Chef::Log.debug("Using fog to catalog all volumes")
+    @fog_volumes = ClusterChef.fog_connection.volumes
+  end
+
   def self.fog_keypairs
     return @fog_keypairs if @fog_keypairs
     Chef::Log.debug("Using fog to catalog all keypairs")

data/lib/cluster_chef/fog_layer.rb

@@ -38,9 +38,11 @@ module ClusterChef
     # Takes key-value pairs and idempotently sets those tags on the cloud machine
     #
     def fog_create_tags(fog_obj, desc, tags)
-      tags.each do |key, value|
-        next if fog_obj.tags[key] == value.to_s
-        Chef::Log.debug( "tagging #{key} = #{value} on #{desc}" )
+      tags_to_create = tags.reject{|key, val| fog_obj.tags[key] == val.to_s }
+      return if tags_to_create.empty?
+      step("  tagging #{desc} with #{tags_to_create.inspect}", :green)
+      tags_to_create.each do |key, value|
+        Chef::Log.debug( "tagging #{desc} with #{key} = #{value}" )
         safely do
           ClusterChef.fog_connection.tags.create({
             :key => key, :value => value.to_s, :resource_id => fog_obj.id })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster_chef
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70174892097080 !ruby/object:Gem::Requirement
+  requirement: &70343611049240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70174892097080
+  version_requirements: *70343611049240
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70174892095600 !ruby/object:Gem::Requirement
+  requirement: &70343611048760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174892095600
+  version_requirements: *70343611048760
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70174892094120 !ruby/object:Gem::Requirement
+  requirement: &70343611048180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174892094120
+  version_requirements: *70343611048180
 - !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &70174892092520 !ruby/object:Gem::Requirement
+  requirement: &70343611047680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70174892092520
+  version_requirements: *70343611047680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174892090980 !ruby/object:Gem::Requirement
+  requirement: &70343611047060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70174892090980
+  version_requirements: *70343611047060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174892090160 !ruby/object:Gem::Requirement
+  requirement: &70343611046520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70174892090160
+  version_requirements: *70343611046520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174892089660 !ruby/object:Gem::Requirement
+  requirement: &70343611046020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70174892089660
+  version_requirements: *70343611046020
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70174892089040 !ruby/object:Gem::Requirement
+  requirement: &70343611045520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70174892089040
+  version_requirements: *70343611045520
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &70174892088480 !ruby/object:Gem::Requirement
+  requirement: &70343611045020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,18 +109,18 @@ dependencies:
         version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *70174892088480
+  version_requirements: *70343611045020
 - !ruby/object:Gem::Dependency
   name: cluster_chef-knife
-  requirement: &70174892087940 !ruby/object:Gem::Requirement
+  requirement: &70343611044520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70174892087940
+  version_requirements: *70343611044520
 description: cluster_chef 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.
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3376503058401634367
+      hash: -900538870253244074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: