chef 0.9.12 → 0.9.14.beta.1

data/lib/chef/knife/node_list.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/node_run_list_add.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/node_run_list_remove.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/node_show.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/rackspace_server_create.rb

@@ -17,7 +17,8 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
+require 'uuidtools'
 
 class Chef
   class Knife
@@ -36,14 +37,29 @@ class Chef
         :short => "-i IMAGE",
         :long => "--image IMAGE",
         :description => "The image of the server",
-        :proc => Proc.new { |i| i.to_i },
-        :default => 14362
+        :proc => Proc.new { |i| i.to_i }
 
       option :server_name,
-        :short => "-N NAME",
+        :short => "-S NAME",
         :long => "--server-name NAME",
-        :description => "The server name",
-        :default => "wtf"
+        :description => "The server name. Defaults to a random UUID.",
+        :default => UUIDTools::UUID.random_create.to_s
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
+
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username",
+        :default => "root"
+
+      option :ssh_password,
+        :short => "-P PASSWORD",
+        :long => "--ssh-password PASSWORD",
+        :description => "The ssh password"
 
       option :api_key,
         :short => "-K KEY",
@@ -57,9 +73,43 @@ class Chef
         :description => "Your rackspace API username",
         :proc => Proc.new { |username| Chef::Config[:knife][:rackspace_api_username] = username } 
 
+      option :prerelease,
+        :long => "--prerelease",
+        :description => "Install the pre-release chef gems"
+
+      option :distro,
+        :short => "-d DISTRO",
+        :long => "--distro DISTRO",
+        :description => "Bootstrap a distro using a template",
+        :default => "ubuntu10.04-gems"
+
+      option :template_file,
+        :long => "--template-file TEMPLATE",
+        :description => "Full path to location of template to use",
+        :default => false
+
       def h
         @highline ||= HighLine.new
       end
+      
+      def tcp_test_ssh(hostname)
+        tcp_socket = TCPSocket.new(hostname, 22)
+        readable = IO.select([tcp_socket], nil, nil, 5)
+        if readable
+          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          yield
+          true
+        else
+          false
+        end
+      rescue Errno::ETIMEDOUT
+        false
+      rescue Errno::ECONNREFUSED
+        sleep 2
+        false
+      ensure
+        tcp_socket && tcp_socket.close
+      end
 
       def run 
         require 'fog'
@@ -67,87 +117,65 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
 
-        connection = Fog::Rackspace::Servers.new(
+        $stdout.sync = true
+
+        connection = Fog::Rackspace::Compute.new(
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
           :rackspace_username => Chef::Config[:knife][:rackspace_api_username] 
         )
 
-        server = connection.servers.new
-       
-        server.flavor_id = config[:flavor]
-        server.image_id = config[:image]
-        server.name = config[:server_name]
-        server.personality = [
-          { 
-            'path' => '/etc/install-chef',
-            'contents' => <<-EOH
-#!/bin/bash
-# Customized rc.local for chef installation
-
-if [ ! -f /usr/bin/chef-client ]; then
-  apt-get update
-  apt-get install -y ruby ruby1.8-dev build-essential wget libruby-extras libruby1.8-extras
-  cd /tmp
-  wget http://rubyforge.org/frs/download.php/69365/rubygems-1.3.6.tgz
-  tar xvf rubygems-1.3.6.tgz
-  cd rubygems-1.3.6
-  ruby setup.rb
-  cp /usr/bin/gem1.8 /usr/bin/gem
-  gem install chef ohai --no-rdoc --no-ri --verbose
-fi
-
-exit 0
-EOH
-          },
-          { 
-            'path' => "/etc/chef/validation.pem",
-            'contents' => IO.read(Chef::Config[:validation_key])
-          },
-          { 
-            'path' => "/etc/chef/client.rb",
-            'contents' => <<-EOH
-log_level        :info
-log_location     STDOUT
-chef_server_url  "#{Chef::Config[:chef_server_url]}" 
-validation_client_name "#{Chef::Config[:validation_client_name]}"
-EOH
-          },
-          {
-            'path' => "/etc/chef/first-boot.json",
-            'contents' => { "run_list" => @name_args }.to_json
-          },
-        ]
-
-        server.save
-
-        $stdout.sync = true
+        server = connection.servers.create(
+          :name => config[:server_name],
+          :image_id => config[:image],
+          :flavor_id => config[:flavor]
+        )
 
+        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
         puts "#{h.color("Name", :cyan)}: #{server.name}"
         puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
         puts "#{h.color("Image", :cyan)}: #{server.image_id}"
-        puts "#{h.color("Public Address", :cyan)}: #{server.addresses["public"]}"
-        puts "#{h.color("Private Address", :cyan)}: #{server.addresses["private"]}"
+        puts "#{h.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
+        puts "#{h.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
         puts "#{h.color("Password", :cyan)}: #{server.password}"
-     
+
         print "\n#{h.color("Requesting server", :magenta)}"
-        saved_password = server.password
 
         # wait for it to be ready to do stuff
         server.wait_for { print "."; ready? }
 
-        puts "\nServer ready, waiting 15 seconds to bootstrap."
-        sleep 15
+        puts("\n")
+
+        print "\n#{h.color("Waiting for sshd", :magenta)}"
+
+        print(".") until tcp_test_ssh(server.addresses["public"][0]) { sleep @initial_sleep_delay ||= 10; puts("done") }
 
-        puts "\nBootstrapping #{h.color(server.name, :bold)}..."
+        bootstrap_for_node(server).run
 
-        ssh = Chef::Knife::Ssh.new
-        ssh.name_args = [ server.addresses["public"][0], "/bin/bash /etc/install-chef && /usr/bin/chef-client -j /etc/chef/first-boot.json" ]
-        ssh.config[:ssh_user] = "root"
-        ssh.config[:manual] = true
-        ssh.config[:ssh_password] = saved_password
-        ssh.password = saved_password
-        ssh.run
+        puts "\n"
+        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{h.color("Name", :cyan)}: #{server.name}"
+        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{h.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
+        puts "#{h.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
+        puts "#{h.color("Password", :cyan)}: #{server.password}"
+        puts "#{h.color("Run List", :cyan)}: #{@name_args.join(', ')}"
+      end
 
+      def bootstrap_for_node(server)
+        bootstrap = Chef::Knife::Bootstrap.new
+        bootstrap.name_args = [server.addresses["public"][0]]
+        bootstrap.config[:run_list] = @name_args
+        bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
+        bootstrap.config[:ssh_password] = server.password
+        bootstrap.config[:identity_file] = config[:identity_file]
+        bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
+        bootstrap.config[:prerelease] = config[:prerelease]
+        bootstrap.config[:distro] = config[:distro]
+        bootstrap.config[:use_sudo] = true
+        bootstrap.config[:template_file] = config[:template_file]
+        bootstrap.config[:environment] = config[:environment]
+        bootstrap
       end
     end
   end

data/lib/chef/knife/rackspace_server_delete.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -35,7 +35,7 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
 
-        connection = Fog::Rackspace::Servers.new(
+        connection = Fog::Rackspace::Compute.new(
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
           :rackspace_username => Chef::Config[:knife][:rackspace_api_username] 
         )

data/lib/chef/knife/rackspace_server_list.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -35,7 +35,7 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
 
-        connection = Fog::Rackspace::Servers.new(
+        connection = Fog::Rackspace::Compute.new(
           :rackspace_api_key => Chef::Config[:knife][:rackspace_api_key],
           :rackspace_username => Chef::Config[:knife][:rackspace_api_username] 
         )

data/lib/chef/knife/role_bulk_delete.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/role_create.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/role'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/role_delete.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/role'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/role_edit.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/role'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/role_from_file.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/role'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -33,7 +33,7 @@ class Chef
         
         output(format_for_display(updated)) if config[:print_after]
 
-        Chef::Log.warn("Updated Role #{updated.name}!")
+        Chef::Log.info("Updated Role #{updated.name}!")
       end
 
     end

data/lib/chef/knife/role_list.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/role_show.rb

@@ -18,7 +18,7 @@
 
 require 'chef/knife'
 require 'chef/node'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife

data/lib/chef/knife/slicehost_images_list.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -33,7 +33,7 @@ class Chef
         require 'fog'
         require 'highline'
 
-        slicehost = Fog::Slicehost.new(
+        slicehost = Fog::Slicehost::Compute.new(
           :slicehost_password => Chef::Config[:knife][:slicehost_password]
         )
 

data/lib/chef/knife/slicehost_server_create.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -62,7 +62,7 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
 
-        slicehost = Fog::Slicehost.new(
+        slicehost = Fog::Slicehost::Compute.new(
           :slicehost_password => Chef::Config[:knife][:slicehost_password]
         )
 

data/lib/chef/knife/slicehost_server_delete.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -29,7 +29,7 @@ class Chef
         require 'fog'
         require 'readline'
         
-        slicehost = Fog::Slicehost.new(
+        slicehost = Fog::Slicehost::Compute.new(
           :slicehost_password => Chef::Config[:knife][:slicehost_password]
         )
       

data/lib/chef/knife/slicehost_server_list.rb

@@ -17,7 +17,7 @@
 #
 
 require 'chef/knife'
-require 'json'
+require 'chef/json'
 
 class Chef
   class Knife
@@ -35,7 +35,7 @@ class Chef
         require 'net/ssh/multi'
         require 'readline'
         
-        slicehost = Fog::Slicehost.new(
+        slicehost = Fog::Slicehost::Compute.new(
           :slicehost_password => Chef::Config[:knife][:slicehost_password]
         )
        

data/lib/chef/knife/ssh.rb

@@ -231,30 +231,54 @@ class Chef
       end
 
       def tmux
+        ssh_dest = lambda do |server|
+          prefix = server.user ? "#{server.user}@" : ""
+          "'ssh #{prefix}#{server.host}'"
+        end
+
+        new_window_cmds = lambda do
+          if session.servers_for.size > 1
+            [""] + session.servers_for[1..-1].map do |server|
+              "new-window -a -n '#{server.host}' #{ssh_dest.call(server)}"
+            end
+          else
+            []
+          end.join(" \\; ")
+        end
+
+        tmux_name = "'knife ssh #{@name_args[0]}'"
         begin
-          Chef::Mixin::Command.run_command(:command => "tmux new-session -d -s 'knife'")
+          server = session.servers_for.first
+          cmd = ["tmux new-session -d -s #{tmux_name}",
+                 "-n '#{server.host}'", ssh_dest.call(server),
+                 new_window_cmds.call].join(" ")
+          Chef::Mixin::Command.run_command(:command => cmd)
+          exec("tmux attach-session -t #{tmux_name}")
         rescue Chef::Exceptions::Exec
         end
-        session.servers_for.each do |server|
-          begin
-            Chef::Mixin::Command.run_command(:command => "tmux new-window -d -n '#{server.host}' -t 'knife' 'ssh #{server.user ? "#{server.user}@#{server.host}" : server.host}'")
-          rescue Chef::Exceptions::Exec
-          end
-        end
-        exec("tmux attach-session -t knife")
       end
 
       def macterm
-        require 'appscript'
+        begin
+          require 'appscript'
+        rescue LoadError
+          STDERR.puts "you need the rb-appscript gem to use knife ssh macterm. `(sudo) gem install rb-appscript` to install"
+          raise
+        end
+
         Appscript.app("/Applications/Utilities/Terminal.app").windows.first.activate  
         Appscript.app("System Events").application_processes["Terminal.app"].keystroke("n", :using=>:command_down)
         term = Appscript.app('Terminal')  
         window = term.windows.first.get
-        session.servers_for.each do |server|
+
+        (session.servers_for.size - 1).times do |i|
+          window.activate
           Appscript.app("System Events").application_processes["Terminal.app"].keystroke("t", :using=>:command_down)
+        end
+
+        session.servers_for.each_with_index do |server, tab_number|
           cmd = "unset PROMPT_COMMAND; echo -e \"\\033]0;#{server.host}\\007\"; ssh #{server.user ? "#{server.user}@#{server.host}" : server.host}"
-          Appscript.app('Terminal').do_script(cmd, :in => window.tabs.last.get)
-          sleep 1
+          Appscript.app('Terminal').do_script(cmd, :in => window.tabs[tab_number + 1].get)
         end
       end