cluster_chef-knife 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-knife.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cluster_chef-knife"
-  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 = [

data/lib/chef/knife/bootstrap/ubuntu11.10-cluster_chef.erb

@@ -1,4 +1,4 @@
-bash -c '
+bash <<EOF || echo "Chef bootstrap failed!"
 
 # This is the ubuntu-10.04-cluster_chef script from infochimps, which
 # is based on the ubuntu-10.04-gems script from opscode, but it
@@ -21,7 +21,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 # source for sun java if you want to install it later
 apt-get install -y python-software-properties
-add-apt-repository ppa:ferramroberto/java
+add-apt-repository -y ppa:ferramroberto/java
 apt-get -y update
 
 if [ ! -f /usr/bin/chef-client ]; then
@@ -34,9 +34,14 @@ apt-get install -y build-essential wget ruby1.9.1 ruby1.9.1-dev runit zlib1g-dev
 
 if ruby -e "exit(%x{gem --version} < \"1.6.2\" ? 0 : -1 )" ; then
   echo -e "`date` \n\n**** \n**** Updating rubygems:\n****\n"
-  gem update --system
+  # screw you Debian
+  REALLY_GEM_UPDATE_SYSTEM=1 gem update --system
   # screw you rubygems
-  for foo in /usr/lib/ruby/site_ruby/*/rubygems/deprecate.rb ; do sudo sed -i.bak 's!@skip ||= false!true!' "$foo" ; done
+  for foo in /usr/lib/ruby/site_ruby/*/rubygems/deprecate.rb
+  do
+    # Don't have to be any such deprecations, in which case $foo won't exist
+    [ -f "$foo" ] && sudo sed -i.bak 's!@skip ||= false!true!' "$foo"
+  done
 fi
 
 echo -e "`date` \n\n**** \n**** Installing chef:\n****\n"
@@ -96,19 +101,19 @@ EOP
 echo -e "`date` \n\n**** \n**** Adding chef client runit scripts:\n****\n"
 (service chef-client stop >/dev/null 2>&1 ; sleep 1 ; killall chef-client 2>/dev/null) || true
 mkdir -p /var/log/chef /var/chef /etc/service /etc/sv/chef-client/{log/main,supervise} 
-cat > /etc/sv/chef-client/log/run <<EOF
+cat > /etc/sv/chef-client/log/run <<EOP
 #!/bin/bash
 exec svlogd -tt ./main
-EOF
-cat > /etc/sv/chef-client/run <<EOF
+EOP
+cat > /etc/sv/chef-client/run <<EOP
 #!/bin/bash
 exec 2>&1
 exec /usr/bin/env chef-client -i 43200 -s 20 -L /var/log/chef/client.log
-EOF
+EOP
 chmod +x  /etc/sv/chef-client/log/run /etc/sv/chef-client/run
 ln -nfs /usr/bin/sv /etc/init.d/chef-client
 
-service chef-client stop || true
+service chef-client stop >/dev/null 2>&1 || true
 
 <%- if (@config[:bootstrap_runs_chef_client].to_s == 'true') || (@chef_config.knife[:bootstrap_runs_chef_client].to_s == 'true') %>
 echo -e "`date` \n\n**** \n**** First run of chef:\n****\n"
@@ -125,4 +130,4 @@ ln -nfs /etc/sv/chef-client /etc/service/chef-client
 service chef-client start
 
 echo -e "`date` \n\n**** \n**** Cluster Chef client bootstrap complete\n****\n"
-' || echo "Chef bootstrap failed!"
+EOF

data/lib/chef/knife/cluster_launch.rb

@@ -116,14 +116,18 @@ class Chef
         # Wait for node creation on amazon side
         server.fog_server.wait_for{ ready? }
 
-        # Attach volumes, etc
-        server.sync_to_cloud
-
         # Try SSH
         unless config[:dry_run]
           nil until tcp_test_ssh(server.fog_server.dns_name){ sleep @initial_sleep_delay ||= 10  }
         end
 
+        # Make sure our list of volumes is accurate
+        ClusterChef.fetch_fog_volumes
+        server.discover_volumes!
+
+        # Attach volumes, etc
+        server.sync_to_cloud
+
         # Run Bootstrap
         if config[:bootstrap]
           run_bootstrap(server, server.fog_server.dns_name)

data/lib/chef/knife/cluster_list.rb

@@ -24,7 +24,7 @@ class Chef
       include ClusterChef::KnifeCommon
 
       deps do
-        ClusterChef::KnifeCommon.load_deps
+        require 'formatador'
       end
 
       banner "knife cluster list (options)"

data/lib/chef/knife/knife_common.rb

@@ -4,7 +4,6 @@ module ClusterChef
   module KnifeCommon
 
     def self.load_deps
-      require 'readline'
       require 'formatador'
       require 'chef/node'
       require 'chef/api_client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster_chef-knife
 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: &70174880466240 !ruby/object:Gem::Requirement
+  requirement: &70343609384260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70174880466240
+  version_requirements: *70343609384260
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70174880464680 !ruby/object:Gem::Requirement
+  requirement: &70343609383380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174880464680
+  version_requirements: *70343609383380
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70174880479940 !ruby/object:Gem::Requirement
+  requirement: &70343609382760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174880479940
+  version_requirements: *70343609382760
 - !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &70174880477380 !ruby/object:Gem::Requirement
+  requirement: &70343609397920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70174880477380
+  version_requirements: *70343609397920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174880475480 !ruby/object:Gem::Requirement
+  requirement: &70343609396860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70174880475480
+  version_requirements: *70343609396860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174880473820 !ruby/object:Gem::Requirement
+  requirement: &70343609395620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70174880473820
+  version_requirements: *70343609395620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174880472800 !ruby/object:Gem::Requirement
+  requirement: &70343609393700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70174880472800
+  version_requirements: *70343609393700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70174880488500 !ruby/object:Gem::Requirement
+  requirement: &70343609392020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70174880488500
+  version_requirements: *70343609392020
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &70174880487740 !ruby/object:Gem::Requirement
+  requirement: &70343609391160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *70174880487740
+  version_requirements: *70343609391160
 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.
@@ -176,7 +176,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: