ironfan 4.7.5 → 4.7.6

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.7.6
+* adding chef-client-nonce invocation to knife cluster kick
+
 # v4.7.5
 * cluster_launch: correcting public_target to public_hostname
 

data/Rakefile

@@ -45,7 +45,7 @@ Jeweler::Tasks.new do |gem|
   gem.name        = 'ironfan'
   gem.homepage    = "http://infochimps.com/labs"
   gem.license     = NEW_COOKBOOK_LICENSE.to_s
-  gem.summary     = %Q{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.}
+  gem.summary     = %Q{Infochimps' lightweight cloud orchestration toolkit, built on top of Chef.}
   gem.description = %Q{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.}
   gem.email       = SSL_EMAIL_ADDRESS
   gem.authors     = ["Infochimps"]

data/VERSION

@@ -1 +1 @@
-4.7.5
+4.7.6

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.7.5"
+  s.version = "4.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-01-18"
+  s.date = "2013-01-25"
   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 = [
@@ -148,7 +148,7 @@ Gem::Specification.new do |s|
   s.licenses = ["apachev2"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  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.summary = "Infochimps' lightweight cloud orchestration toolkit, built on top of Chef."
   s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/chef/cluster_launch_spec.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
 
   if s.respond_to? :specification_version then

data/lib/chef/knife/cluster_kick.rb

@@ -63,35 +63,45 @@ sudo -p 'knife sudo password: ' true
 
 <%= ((config[:verbosity].to_i > 1) ? "set -v" : "") %>
 
-if sudo  -p 'knife sudo password: ' service chef-client status ; then
-
-  # running
-  pid_file="<%= config[:pid_file] %>"
-  log_file=<%= config[:log_file] %>
-
-  declare tail_pid
-
-  on_exit() {
-    rm -f $pipe
-  }
-
-  trap "on_exit" EXIT ERR
-
-  pipe=/tmp/pipe-$$
-  mkfifo $pipe
-
-  tail -Fn0 "$log_file" > $pipe &
-
-  tail_pid=$!
-
-  pid="$(sudo -p 'knife sudo password: ' cat $pid_file)"
-  sudo -p 'knife sudo password: ' kill -USR1 "$pid"
-  GOOD_RESULT='INFO: Report handlers complete\$'
-  BAD_RESULT='ERROR: Sleeping for [0-9]+ seconds before trying again\$'
-  sed -r -e "/$GOOD_RESULT/{q 0}" -e"/$BAD_RESULT/{q 1}" $pipe
+# New style server, using chef-client-nonce
+if [ -f /etc/init.d/chef-client-nonce ]; then
+  echo -e "****\n\nstarting chef-client-nonce service\n\n****\n"
+  sudo -p 'knife sudo password: ' service chef-client-nonce start
+# Old style server, using long-running chef-client
+elif [ -f /etc/init.d/chef-client ]; then
+  if sudo  -p 'knife sudo password: ' service chef-client status ; then
+
+    # running
+    pid_file="<%= config[:pid_file] %>"
+    log_file=<%= config[:log_file] %>
+
+    declare tail_pid
+
+    on_exit() {
+      rm -f $pipe
+    }
+
+    trap "on_exit" EXIT ERR
+
+    pipe=/tmp/pipe-$$
+    mkfifo $pipe
+
+    tail -Fn0 "$log_file" > $pipe &
+
+    tail_pid=$!
+
+    pid="$(sudo -p 'knife sudo password: ' cat $pid_file)"
+    sudo -p 'knife sudo password: ' kill -USR1 "$pid"
+    GOOD_RESULT='INFO: Report handlers complete\$'
+    BAD_RESULT='ERROR: Sleeping for [0-9]+ seconds before trying again\$'
+    sed -r -e "/$GOOD_RESULT/{q 0}" -e"/$BAD_RESULT/{q 1}" $pipe
+  else
+    echo -e "****\n\nchef-client daemon not running, invoking chef-client directly\n\n****\n"
+    sudo -p 'knife sudo password: ' chef-client
+  fi
 else
-  echo -e "****\n\nchef-client daemon not running, invoking chef-client directly\n\n****\n"
-  sudo -p 'knife sudo password: ' chef-client
+  echo -e "****\n\nNo chef-client found!\n\n****\n"
+  exit 1
 fi
 EOF
       end

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.7.5
+  version: 4.7.6
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-18 00:00:00 Z
+date: 2013-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -282,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -946421318815757718
+      hash: -1978687581575052392
       segments: 
       - 0
       version: "0"
@@ -298,7 +298,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-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.
+summary: Infochimps' lightweight cloud orchestration toolkit, built on top of Chef.
 test_files: 
 - spec/spec_helper/dummy_chef.rb
 - spec/integration/spec_helper/launch_cluster.rb