cluster_chef 3.0.12 → 3.0.14

data/ironfan.gemspec

@@ -0,0 +1,123 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "ironfan"
+  s.version = "3.0.14"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Infochimps"]
+  s.date = "2012-02-15"
+  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 = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+    ".rspec",
+    "CHANGELOG.md",
+    "Gemfile",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "TODO.md",
+    "VERSION",
+    "chefignore",
+    "cluster_chef-knife.gemspec",
+    "cluster_chef.gemspec",
+    "config/client.rb",
+    "config/proxy.pac",
+    "config/ubuntu10.04-cluster_chef.erb",
+    "config/ubuntu11.10-cluster_chef.erb",
+    "lib/chef/knife/bootstrap/ubuntu10.04-cluster_chef.erb",
+    "lib/chef/knife/bootstrap/ubuntu11.10-cluster_chef.erb",
+    "lib/chef/knife/cluster_bootstrap.rb",
+    "lib/chef/knife/cluster_kick.rb",
+    "lib/chef/knife/cluster_kill.rb",
+    "lib/chef/knife/cluster_launch.rb",
+    "lib/chef/knife/cluster_list.rb",
+    "lib/chef/knife/cluster_proxy.rb",
+    "lib/chef/knife/cluster_show.rb",
+    "lib/chef/knife/cluster_ssh.rb",
+    "lib/chef/knife/cluster_start.rb",
+    "lib/chef/knife/cluster_stop.rb",
+    "lib/chef/knife/cluster_sync.rb",
+    "lib/chef/knife/generic_command.rb",
+    "lib/chef/knife/knife_common.rb",
+    "lib/cluster_chef.rb",
+    "lib/cluster_chef/chef_layer.rb",
+    "lib/cluster_chef/cloud.rb",
+    "lib/cluster_chef/cluster.rb",
+    "lib/cluster_chef/compute.rb",
+    "lib/cluster_chef/deprecated.rb",
+    "lib/cluster_chef/discovery.rb",
+    "lib/cluster_chef/dsl_object.rb",
+    "lib/cluster_chef/facet.rb",
+    "lib/cluster_chef/fog_layer.rb",
+    "lib/cluster_chef/private_key.rb",
+    "lib/cluster_chef/role_implications.rb",
+    "lib/cluster_chef/security_group.rb",
+    "lib/cluster_chef/server.rb",
+    "lib/cluster_chef/server_slice.rb",
+    "lib/cluster_chef/volume.rb",
+    "notes/aws_console_screenshot.jpg",
+    "rspec.watchr",
+    "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.rb",
+    "spec/spec_helper/dummy_chef.rb",
+    "spec/test_config.rb",
+    "tasks/chef_config.rake",
+    "tasks/jeweler_use_alt_branch.rake"
+  ]
+  s.homepage = "http://infochimps.com/labs"
+  s.licenses = ["apachev2"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "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.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"]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<chef>, ["~> 0.10.4"])
+      s.add_runtime_dependency(%q<fog>, ["~> 1.1.1"])
+      s.add_runtime_dependency(%q<formatador>, ["~> 0.2.1"])
+      s.add_runtime_dependency(%q<gorillib>, ["~> 0.1.7"])
+      s.add_development_dependency(%q<bundler>, ["~> 1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
+      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"])
+    else
+      s.add_dependency(%q<chef>, ["~> 0.10.4"])
+      s.add_dependency(%q<fog>, ["~> 1.1.1"])
+      s.add_dependency(%q<formatador>, ["~> 0.2.1"])
+      s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
+      s.add_dependency(%q<bundler>, ["~> 1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<yard>, ["~> 0.6"])
+      s.add_dependency(%q<configliere>, ["~> 0.4.8"])
+    end
+  else
+    s.add_dependency(%q<chef>, ["~> 0.10.4"])
+    s.add_dependency(%q<fog>, ["~> 1.1.1"])
+    s.add_dependency(%q<formatador>, ["~> 0.2.1"])
+    s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
+    s.add_dependency(%q<bundler>, ["~> 1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<yard>, ["~> 0.6"])
+    s.add_dependency(%q<configliere>, ["~> 0.4.8"])
+  end
+end
+

data/lib/cluster_chef/chef_layer.rb

@@ -149,6 +149,10 @@ module ClusterChef
       @chef_client_script_content = safely{ File.read(script_filename) }
     end
 
+    def announce_state state
+      @chef_node.set[:state] = state
+    end
+
   protected
 
     # Create the chef client on the server. Do not call this directly -- go

data/lib/cluster_chef/compute.rb

@@ -73,7 +73,6 @@ module ClusterChef
     def raid_group(rg_name, attrs={}, &block)
       volumes[rg_name] ||= ClusterChef::RaidGroup.new(:parent => self, :name => rg_name)
       volumes[rg_name].configure(attrs, &block)
-      p volumes
       volumes[rg_name].sub_volumes.each do |sv_name|
         volume(sv_name){ in_raid(rg_name) ; mountable(false) ; tags({}) }
       end

data/lib/cluster_chef/discovery.rb

@@ -5,7 +5,7 @@ module ClusterChef
       @aws_instance_hash = {}
       discover_cluster_chef!
       discover_chef_nodes!
-      discover_fog_servers!
+      discover_fog_servers!  unless ClusterChef.chef_config[:cloud] == false
       discover_chef_clients!
       discover_volumes!
     end
@@ -13,7 +13,19 @@ module ClusterChef
     def chef_clients
       return @chef_clients if @chef_clients
       @chef_clients = []
-      Chef::Search::Query.new.search(:client, "clientname:#{cluster_name}-*") do |client_hsh|
+
+      # Oh for fuck's sake -- the key used to index clients changed from
+      # 'clientname' in 0.10.4-and-prev to 'name' in 0.10.8. Rather than index
+      # both 'clientname' and 'name', they switched it -- so we have to fall
+      # back.  FIXME: While the Opscode platform is 0.10.4 I have clientname
+      # first (sorry, people of the future). When it switches to 0.10.8 we'll
+      # reverse them (suck it people of the past).
+      # Also sometimes the server returns results that are nil on
+      # recently-expired clients, so that's annoying too.
+      clients, wtf, num = Chef::Search::Query.new.search(:client, "clientname:#{cluster_name}-*") ; clients.compact!
+      clients, wtf, num = Chef::Search::Query.new.search(:client, "name:#{cluster_name}-*") if clients.blank?
+      clients.each do |client_hsh|
+        next if client_hsh.nil?
         # Return values from Chef::Search seem to be inconsistent across chef
         # versions (sometimes a hash, sometimes an object). Fix if necessary.
         client_hsh = Chef::ApiClient.json_create(client_hsh) unless client_hsh.is_a?(Chef::ApiClient)

data/lib/cluster_chef/fog_layer.rb

@@ -65,6 +65,7 @@ module ClusterChef
       composite_volumes.each do |vol_name, vol|
         my_vol = volumes[vol_name]
         next if my_vol.fog_volume
+        next if ClusterChef.chef_config[:cloud] == false
         my_vol.fog_volume = ClusterChef.fog_volumes.find do |fv|
           ( # matches the explicit volume id
             (vol.volume_id && (fv.id == vol.volume_id)    ) ||
@@ -144,6 +145,6 @@ module ClusterChef
       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

@@ -2,8 +2,8 @@ module ClusterChef
   ComputeBuilder.class_eval do
 
     # organization-wide security group
-    role_implication "org_base" do
-      self.cloud.security_group "org_base" do
+    role_implication "systemwide" do
+      self.cloud.security_group "systemwide" do
       end
     end
 

data/lib/cluster_chef/server.rb

@@ -263,5 +263,19 @@ module ClusterChef
       composite_volumes.values.map(&:block_device_mapping).compact
     end
 
+    # ugh. non-dry below.
+
+    def announce_as_started
+      return unless chef_node
+      announce_state('start')
+      chef_node.save
+    end
+
+    def announce_as_stopped
+      return unless chef_node
+      announce_state('stop')
+      chef_node.save
+    end
+
   end
 end

metadata

@@ -1,137 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cluster_chef
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.0.14
   prerelease: 
-  version: 3.0.12
 platform: ruby
-authors: 
+authors:
 - Infochimps
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70259608686280 !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: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608686280
+- !ruby/object:Gem::Dependency
   name: fog
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70259608685380 !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: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608685380
+- !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70259608684540 !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: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608684540
+- !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70259608683880 !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: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608683880
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70259608683280 !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: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608683280
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70259608682740 !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: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608682740
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70259608698400 !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: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608698400
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70259608695240 !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: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608695240
+- !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70259608694580 !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: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70259608694580
+- !ruby/object:Gem::Dependency
   name: cluster_chef-knife
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70259608693700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 3.0.12
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.14
   type: :runtime
   prerelease: false
-  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.
+  version_requirements: *70259608693700
+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
@@ -143,18 +142,16 @@ files:
 - VERSION
 - chefignore
 - cluster_chef.gemspec
-- clusters/website_demo.rb
 - config/client.rb
 - config/proxy.pac
+- config/ubuntu10.04-cluster_chef.erb
+- config/ubuntu11.10-cluster_chef.erb
+- ironfan.gemspec
 - lib/cluster_chef.rb
 - lib/cluster_chef/chef_layer.rb
 - lib/cluster_chef/cloud.rb
 - lib/cluster_chef/cluster.rb
 - lib/cluster_chef/compute.rb
-- lib/cluster_chef/cookbook_munger.rb
-- lib/cluster_chef/cookbook_munger/README.md.erb
-- lib/cluster_chef/cookbook_munger/licenses.yaml
-- lib/cluster_chef/cookbook_munger/metadata.rb.erb
 - lib/cluster_chef/deprecated.rb
 - lib/cluster_chef/discovery.rb
 - lib/cluster_chef/dsl_object.rb
@@ -179,36 +176,36 @@ files:
 - tasks/chef_config.rake
 - tasks/jeweler_use_alt_branch.rake
 homepage: http://infochimps.com/labs
-licenses: 
+licenses:
 - apachev2
-post_install_message: 
+post_install_message: ! "!! This gem has been renamed 'ironfan' (from cluster_chef).
+  \n   It will not be updated after Feb. 2012. \n  Sorry for the inconvenience."
 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 
-      hash: 373181579172920968
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 115206257048957134
+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.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