cluster_chef 3.0.9 → 3.0.10

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v3.0.10: Cloud fixes
+
+* security groups are now created/updated in knife cluster sync. This can't help you apply then to a node afer launch though -- nothing can, the API doesn't allow it.
+* clusters now all refer to an AMI named `cluster_chef-natty` by default, and to customizable roles `org_base`, `org_final` and `org_users` (where `org_base` has a role_implication for membership in the systemwide `org_base` security group)
+* default facet instances is now 1 who knows why it wasn't always 1.
+* minor linting of cluster before launching it
+* bump to latest versions of oneiric AMIs thx @redbeard
+* bootstrap fixes, oneiric support, more from @gchpaco
+
+
 ## v3.0.6: schism of cookbooks and tools
 
 * cookbooks all now live in [their own repo](https://github.com/infochimps-labs/cluster_chef-homebase), organized according to opscode standard.

data/README.md

@@ -1,12 +1,15 @@
 # cluster_chef
 
-Chef is a powerful tool for maintaining and describing the software and configurations that let a machine provide its services.
+Infrastructure as code: describe and orchestrate whole clusters of cloud or virtual machines. 
 
-cluster_chef is
+## Overview
 
-* a clean, expressive way to describe how machines and roles are assembled into a working cluster.
-* Our collection of Industrial-strength, cloud-ready recipes for Hadoop, Cassandra, HBase, Elasticsearch and more.
-* a set of conventions and helpers that make provisioning cloud machines easier.
+The cluster_chef toolset takes chef to the next level:
+
+* `cluster_chef` gem: assembles machines and roles into a working cluster using a clean, expressive domain-specific language.
+* `cluster_chef-knife` knife plugin: orchestrate clusters of machines, in the cloud or VMs.
+* `cluster_chef-homebase`: Our collection of industrial-strength, cloud-ready recipes for Hadoop, HBase, Cassandra, Elasticsearch, Zabbix and more.
+* the `metachef` cookbook: coordinate discovery of services ("list all the machines for `awesome_webapp`, that I might load balance them") and aspects ("
 
 ## Walkthrough
 

data/VERSION

@@ -1 +1 @@
-3.0.9
+3.0.10

data/cluster_chef.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cluster_chef"
-  s.version = "3.0.9"
+  s.version = "3.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2011-12-16"
+  s.date = "2012-01-17"
   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 = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "cluster_chef.gemspec",
     "clusters/website_demo.rb",
     "config/client.rb",
+    "config/proxy.pac",
     "lib/cluster_chef.rb",
     "lib/cluster_chef/chef_layer.rb",
     "lib/cluster_chef/cloud.rb",
@@ -66,7 +67,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://infochimps.com/labs"
   s.licenses = ["apachev2"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "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.test_files = ["spec/cluster_chef/cluster_spec.rb", "spec/cluster_chef/facet_spec.rb", "spec/cluster_chef/server_slice_spec.rb", "spec/cluster_chef/server_spec.rb", "spec/cluster_chef_spec.rb", "spec/spec_helper/dummy_chef.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
 
@@ -83,7 +84,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.9"])
+      s.add_runtime_dependency(%q<cluster_chef-knife>, ["= 3.0.10"])
     else
       s.add_dependency(%q<chef>, ["~> 0.10.4"])
       s.add_dependency(%q<fog>, ["~> 1.1.1"])
@@ -94,7 +95,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.9"])
+      s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.10"])
     end
   else
     s.add_dependency(%q<chef>, ["~> 0.10.4"])
@@ -106,7 +107,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.9"])
+    s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.10"])
   end
 end
 

data/config/proxy.pac

@@ -0,0 +1,12 @@
+function FindProxyForURL(url, host) {
+  if ((shExpMatch(host, "*ec2*.amazonaws.com"      )) ||
+      (shExpMatch(host, "*ec2.internal*"           )) ||
+      (shExpMatch(host, "*compute-*.amazonaws.com" )) ||
+      (shExpMatch(host, "*compute-*.internal*"     )) ||
+      (shExpMatch(host, "*domu*.internal*"         )) ||
+      (shExpMatch(host, "10.*"                     )) 
+      ) {
+    return "SOCKS5 localhost:6666";
+  }
+  return "DIRECT";
+}

data/lib/cluster_chef/chef_layer.rb

@@ -108,9 +108,6 @@ module ClusterChef
 
     # creates or updates the chef node.
     #
-    # FIXME: !! this currently doesn't do the right thing for modifications to the
-    #           chef node. !!
-    #
     # See notes at top of file for why all this jiggery-fuckery
     #
     # * client exists, node exists: assume client can update, weep later when

data/lib/cluster_chef/cloud.rb

@@ -60,7 +60,7 @@ module ClusterChef
       # @returns [Hash] hash of defaults
       def defaults
         reverse_merge!({
-          :image_name         => 'maverick',
+          :image_name         => 'natty',
         })
       end
 
@@ -206,7 +206,7 @@ module ClusterChef
       # Utility methods
 
       def image_info
-        Chef::Config[:ec2_image_info][ [region, bits, backing, image_name] ] or ui.warn "Make sure to define the machine's region, bits, backing and image_name. (Have #{[region, bits, backing, image_name].inspect})"
+        Chef::Config[:ec2_image_info][ [region, bits, backing, image_name] ] or ( ui.warn "Make sure to define the machine's region, bits, backing and image_name. (Have #{[region, bits, backing, image_name].inspect})" ; {} )
       end
 
       def list_images
@@ -217,12 +217,15 @@ module ClusterChef
       end
 
       def flavor(val=nil)
-        warn("Unknown machine image name '#{val}'") if val && (not FLAVOR_INFO.has_key?(val.to_s))
+        if val && (not FLAVOR_INFO.has_key?(val.to_s))
+          ui.warn("Unknown machine image flavor '#{val}'")
+          list_flavors
+        end
         set :flavor, val
       end
 
       def flavor_info
-        FLAVOR_INFO[flavor] or raise "Please define the machine's flavor: have #{self.inspect}"
+        FLAVOR_INFO[flavor] or ( ui.warn "Please define the machine's flavor: have #{self.inspect}" ; {} )
       end
 
       def list_flavors
@@ -358,35 +361,35 @@ module ClusterChef
           #
           # Oneric (Ubuntu 11.10)
           #
-          %w[ ap-northeast-1       32-bit  ebs             oneric                         ] => { :image_id => 'ami-2e90242f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ ap-northeast-1       32-bit  instance        oneric                         ] => { :image_id => 'ami-e49723e5', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ ap-northeast-1       64-bit  ebs             oneric                         ] => { :image_id => 'ami-30902431', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ ap-northeast-1       64-bit  instance        oneric                         ] => { :image_id => 'ami-fa9723fb', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       32-bit  ebs             oneric                         ] => { :image_id => 'ami-84902785', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       32-bit  instance        oneric                         ] => { :image_id => 'ami-5e90275f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       64-bit  ebs             oneric                         ] => { :image_id => 'ami-88902789', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-northeast-1       64-bit  instance        oneric                         ] => { :image_id => 'ami-7c90277d', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
           #
-          %w[ ap-southeast-1       32-bit  ebs             oneric                         ] => { :image_id => 'ami-76057f24', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ ap-southeast-1       32-bit  instance        oneric                         ] => { :image_id => 'ami-82047ed0', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ ap-southeast-1       64-bit  ebs             oneric                         ] => { :image_id => 'ami-7a057f28', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ ap-southeast-1       64-bit  instance        oneric                         ] => { :image_id => 'ami-54057f06', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       32-bit  ebs             oneric                         ] => { :image_id => 'ami-0a327758', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       32-bit  instance        oneric                         ] => { :image_id => 'ami-00327752', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  ebs             oneric                         ] => { :image_id => 'ami-0832775a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ ap-southeast-1       64-bit  instance        oneric                         ] => { :image_id => 'ami-04327756', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
           #
-          %w[ eu-west-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-65b28011', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ eu-west-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-dfcdffab', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ eu-west-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-61b28015', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ eu-west-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-75b28001', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-11f0cc65', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-4ff0cc3b', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-1df0cc69', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ eu-west-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-23f0cc57', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
           #
-          %w[ us-east-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-a7f539ce', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-east-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-29f43840', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-east-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-bbf539d2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-east-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-21f53948', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-a562a9cc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-3962a950', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-bf62a9d6', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-east-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-c162a9a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
           #
-          %w[ us-west-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-79772b3c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-west-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-a7762ae2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-west-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-7b772b3e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-west-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-4b772b0e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            32-bit  ebs             oneric                         ] => { :image_id => 'ami-c9a1fe8c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            32-bit  instance        oneric                         ] => { :image_id => 'ami-21a1fe64', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  ebs             oneric                         ] => { :image_id => 'ami-cba1fe8e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-1            64-bit  instance        oneric                         ] => { :image_id => 'ami-3fa1fe7a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
           #
-          %w[ us-west-2            32-bit  ebs             oneric                         ] => { :image_id => 'ami-20f97410', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-west-2            32-bit  instance        oneric                         ] => { :image_id => 'ami-52f67b62', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-west-2            64-bit  ebs             oneric                         ] => { :image_id => 'ami-2af9741a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
-          %w[ us-west-2            64-bit  instance        oneric                         ] => { :image_id => 'ami-56f67b66', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            32-bit  ebs             oneric                         ] => { :image_id => 'ami-ea9a17da', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            32-bit  instance        oneric                         ] => { :image_id => 'ami-f49a17c4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            64-bit  ebs             oneric                         ] => { :image_id => 'ami-ec9a17dc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
+          %w[ us-west-2            64-bit  instance        oneric                         ] => { :image_id => 'ami-fe9a17ce', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
         })
     end
 

data/lib/cluster_chef/facet.rb

@@ -8,7 +8,7 @@ module ClusterChef
       @cluster    = cluster
       @servers    = Mash.new
       @chef_roles = []
-      @settings[:instances] ||= 0
+      @settings[:instances] ||= 1
       create_facet_role
       create_facet_security_group unless attrs[:no_security_group]
     end

data/lib/cluster_chef/fog_layer.rb

@@ -6,14 +6,20 @@ module ClusterChef
 
     def fog_create_server
       step(" creating cloud server", :green)
-      fog_description = fog_description_for_launch
-      Chef::Log.debug(JSON.pretty_generate(fog_description))
+      lint_fog
+      launch_desc = fog_launch_description
+      Chef::Log.debug(JSON.pretty_generate(launch_desc))
       safely do
-        @fog_server = ClusterChef.fog_connection.servers.create(fog_description)
+        @fog_server = ClusterChef.fog_connection.servers.create(launch_desc)
       end
     end
 
-    def fog_description_for_launch
+    def lint_fog
+      unless cloud.image_id then raise "No image ID found: nothing in Chef::Config[:ec2_image_info] for AZ #{self.default_availability_zone} flavor #{cloud.flavor} backing #{cloud.backing} image name #{cloud.image_name}, and cloud.image_id was not set directly. See https://github.com/infochimps/cluster_chef/wiki/machine-image-(AMI)-lookup-by-name - #{cloud.list_images}" end
+      unless cloud.image_id then cloud.list_flavors ; raise "No machine flavor found" ; end
+    end
+
+    def fog_launch_description
       {
         :image_id          => cloud.image_id,
         :flavor_id         => cloud.flavor,
@@ -132,5 +138,12 @@ module ClusterChef
         ClusterChef.fog_keypairs[keypair_name] = keypair_obj
       end
     end
+
+    # Create security groups, their dependencies, and synchronize their permissions
+    def sync_security_groups
+      step("ensuring security groups exist and are correct")
+      security_groups.each{|name,group| group.run }
+    end
+      
   end
 end

data/lib/cluster_chef/role_implications.rb

@@ -1,6 +1,13 @@
 module ClusterChef
   ComputeBuilder.class_eval do
 
+    # organization-wide security group
+    role_implication "org_base" do
+      self.cloud.security_group "org_base" do
+      end
+    end
+
+    # NFS server allows access from nfs_clients
     role_implication "nfs_server" do
       self.cloud.security_group "nfs_server" do
         authorize_group "nfs_client"
@@ -11,12 +18,14 @@ module ClusterChef
       self.cloud.security_group "nfs_client"
     end
 
+    # Opens port 22 to the world
     role_implication "ssh" do
       self.cloud.security_group 'ssh' do
         authorize_port_range 22..22
       end
     end
 
+    # Open the Chef server API port (4000) and the webui (4040)
     role_implication "chef_server" do
       self.cloud.security_group "chef_server" do
         authorize_port_range 4000..4000  # chef-server-api

data/lib/cluster_chef/server_slice.rb

@@ -108,6 +108,7 @@ module ClusterChef
 
     def sync_to_cloud
       sync_keypairs
+      sync_security_groups
       delegate_to_servers( :sync_to_cloud )
     end
 

data/spec/cluster_chef/server_spec.rb

@@ -73,10 +73,10 @@ describe ClusterChef::Server do
   end
 
   describe 'launch' do
-    describe '#fog_description_for_launch' do
+    describe '#fog_launch_description' do
       it 'has right attributes' do
 
-        hsh = @server.fog_description_for_launch
+        hsh = @server.fog_launch_description
         hsh.delete(:user_data)
         hsh.should == {
           :image_id             => "ami-08f40561",
@@ -97,7 +97,7 @@ describe ClusterChef::Server do
       end
 
       it 'has right user_data' do
-        hsh = @server.fog_description_for_launch
+        hsh = @server.fog_launch_description
         user_data_hsh = JSON.parse( hsh[:user_data] )
         user_data_hsh.keys.should == ["chef_server", "validation_client_name", "validation_key", "attributes"]
         user_data_hsh["attributes"].keys.sort.should == [

metadata

@@ -1,136 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cluster_chef
-version: !ruby/object:Gem::Version
-  version: 3.0.9
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 3.0.10
 platform: ruby
-authors:
+authors: 
 - Infochimps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chef
-  requirement: &70343611049240 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70343611049240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: &70343611048760 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70343611048760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: formatador
-  requirement: &70343611048180 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70343611048180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: gorillib
-  requirement: &70343611047680 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70343611047680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70343611047060 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
+      - !ruby/object:Gem::Version 
+        version: "1"
   type: :development
   prerelease: false
-  version_requirements: *70343611047060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &70343611046520 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
+      - !ruby/object:Gem::Version 
+        version: "1.6"
   type: :development
   prerelease: false
-  version_requirements: *70343611046520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70343611046020 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        version: "2.5"
   type: :development
   prerelease: false
-  version_requirements: *70343611046020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &70343611045520 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+      - !ruby/object:Gem::Version 
+        version: "0.6"
   type: :development
   prerelease: false
-  version_requirements: *70343611045520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: configliere
-  requirement: &70343611045020 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *70343611045020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: cluster_chef-knife
-  requirement: &70343611044520 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.0.9
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.0.10
   type: :runtime
   prerelease: false
-  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.
+  version_requirements: *id010
+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.
 email: coders@infochimps.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -144,6 +145,7 @@ files:
 - cluster_chef.gemspec
 - clusters/website_demo.rb
 - config/client.rb
+- config/proxy.pac
 - lib/cluster_chef.rb
 - lib/cluster_chef/chef_layer.rb
 - lib/cluster_chef/cloud.rb
@@ -177,35 +179,36 @@ files:
 - tasks/chef_config.rake
 - tasks/jeweler_use_alt_branch.rake
 homepage: http://infochimps.com/labs
-licenses:
+licenses: 
 - apachev2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 905624580831723867
+      segments: 
       - 0
-      hash: -900538870253244074
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: 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.
-test_files:
+summary: 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.
+test_files: 
 - spec/cluster_chef/cluster_spec.rb
 - spec/cluster_chef/facet_spec.rb
 - spec/cluster_chef/server_slice_spec.rb