chef 0.9.8 → 0.9.10.rc.0

data/lib/chef/knife/bootstrap.rb

@@ -116,11 +116,11 @@ class Chef
         require 'highline'
 
         if @name_args.first == nil
-          Chef::Log.error("Must pass a node name/ip to bootstrap")
+          Chef::Log.error("Must pass an FQDN or ip to bootstrap")
           exit 1
         end
 
-        config[:server_name] = @name_args.first
+        config[:server_name] = Array(@name_args).first
 
         $stdout.sync = true
 

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -0,0 +1,44 @@
+bash -c '
+if [ ! -f /usr/bin/chef-client ]; then
+  pacman -Syy
+  pacman -S --noconfirm ruby ntp
+  ntpdate pool.ntp.org
+  gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+fi
+
+mkdir -p /etc/chef
+(
+cat <<'EOP'
+<%= IO.read(Chef::Config[:validation_key]) %>
+EOP
+) > /tmp/validation.pem
+awk NF /tmp/validation.pem > /etc/chef/validation.pem
+rm /tmp/validation.pem
+
+(
+cat <<'EOP'
+log_level        :info
+log_location     STDOUT
+chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+<% if @config[:chef_node_name] == nil %>
+# Using default node name (fqdn)
+<% else %>
+node_name "<%= @config[:chef_node_name] %>"
+<% end %> 
+# ArchLinux follows the Filesystem Hierarchy Standard
+file_cache_path    "/var/cache/chef"
+file_backup_path   "/var/lib/chef/backup"
+pid_file           "/var/run/chef/client.pid"
+cache_options({ :path => "/var/cache/chef/checksums", :skip_expires => true})
+EOP
+) > /etc/chef/client.rb
+
+(
+cat <<'EOP'
+<%= { "run_list" => @run_list }.to_json %>
+EOP
+) > /etc/chef/first-boot.json
+
+/usr/bin/chef-client -j /etc/chef/first-boot.json
+'

data/lib/chef/knife/bootstrap/client-install.vbs

@@ -0,0 +1,80 @@
+'
+' Author:: Doug MacEachern <dougm@vmware.com>
+' Copyright:: Copyright (c) 2010 VMware, Inc.
+' License:: Apache License, Version 2.0
+'
+' Licensed under the Apache License, Version 2.0 (the "License");
+' you may not use this file except in compliance with the License.
+' You may obtain a copy of the License at
+' 
+'     http://www.apache.org/licenses/LICENSE-2.0
+' 
+' Unless required by applicable law or agreed to in writing, software
+' distributed under the License is distributed on an "AS IS" BASIS,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+' See the License for the specific language governing permissions and
+' limitations under the License.
+'
+' download & install ruby && install chef client gems
+
+Exe = "rubyinstaller-1.8.7-p249-rc2.exe"
+Url = "http://rubyforge.org/frs/download.php/69034/" & Exe
+Dst = "C:\Ruby"
+Proxy = ""
+If WScript.Arguments.Count = 1 Then
+  Proxy = WScript.Arguments.Item(0)
+  WScript.Echo "Using HTTP proxy=" & Proxy
+End If
+
+Set Shell = CreateObject("WScript.Shell")
+Set Fs = CreateObject("Scripting.FileSystemObject")
+If Fs.FileExists(Exe) Then
+  WScript.Echo "Using existing " & Exe
+Else
+  WScript.Echo "Downloading " & Url
+  Set Http = CreateObject("WinHttp.WinHttpRequest.5.1")
+  If Proxy <> "" Then
+     Http.setProxy 2, Proxy, ""
+  End If
+  Http.Open "GET", Url, False
+  Http.Send
+  Set BinaryStream = CreateObject("ADODB.Stream")
+  BinaryStream.Type = 1
+  BinaryStream.Open
+  BinaryStream.Write Http.ResponseBody
+  BinaryStream.SaveToFile Exe, 2
+  BinaryStream.Close
+End If
+
+Ruby = Dst & "\bin\ruby.exe"
+
+If Fs.FileExists(Ruby) Then
+  WScript.Echo Dst & " exists"
+Else
+  WScript.Echo "Installing " & Exe & " to " & Dst
+  Cmd = Exe & " /dir=" & Dst & " /verysilent /tasks=assocfiles,modpath"
+  WScript.Echo Cmd
+  Set Exec = Shell.Exec(Cmd)
+  Do Until Exec.StdOut.AtEndOfStream
+    Line = Exec.StdOut.ReadLine()
+    Wscript.Echo Line
+  Loop
+End If
+
+GemProxy = ""
+If Proxy <> "" Then
+  GemProxy = " --http-proxy=http://" & Proxy
+End If
+
+Cmd = Ruby & " " & Dst & "\bin\gem install" & GemProxy & " --no-ri --no-rdoc chef ruby-wmi windows-pr win32-open3 rubyzip"
+WScript.Echo Cmd
+Set Exec = Shell.Exec(Cmd)
+Do Until Exec.StdOut.AtEndOfStream
+  Line = Exec.StdOut.ReadLine()
+  Wscript.Echo Line
+Loop
+Do Until Exec.StdErr.AtEndOfStream
+  Line = Exec.StdErr.ReadLine()
+  Wscript.Echo Line
+Loop
+

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -3,9 +3,9 @@ if [ ! -f /usr/bin/chef-client ]; then
   echo "chef	chef/chef_server_url	string	<%= Chef::Config[:chef_server_url] %>" | debconf-set-selections 
   [ -f /etc/apt/sources.list.d/opscode.list ] || echo "deb http://apt.opscode.com lucid main" > /etc/apt/sources.list.d/opscode.list
   wget -O- http://apt.opscode.com/packages@opscode.com.gpg.key | apt-key add -
-  apt-get update
-  apt-get install -y chef
 fi
+apt-get update
+apt-get install -y chef
 
 <% unless Chef::Config[:validation_client_name] == "chef-validator" -%>
 [  `grep -qx "validation_client_name \"<%= Chef::Config[:validation_client_name] %>\"" /etc/chef/client.rb` ] || echo "validation_client_name \"<%= Chef::Config[:validation_client_name] %>\"" >> /etc/chef/client.rb

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -3,13 +3,12 @@ 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 ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+  wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+  tar zxf rubygems-1.3.7.tgz
+  cd rubygems-1.3.7
+  ruby setup.rb --no-format-executable
 fi
+gem install ohai chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
 
 mkdir -p /etc/chef
 
@@ -41,4 +40,4 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/first-boot.json
 
-/usr/bin/chef-client -j /etc/chef/first-boot.json'
+/usr/bin/chef-client -j /etc/chef/first-boot.json'

data/lib/chef/knife/bootstrap/windows-gems.erb

@@ -0,0 +1,34 @@
+cscript /nologo client-install.vbs <%= @config[:proxy] %>
+
+> c:/chef/etc/client.rb (
+ @echo.log_level        :info
+ @echo.log_location     STDOUT
+ @echo.chef_server_url  "<%= Chef::Config[:chef_server_url] %>"
+ @echo.validation_client_name "<%= Chef::Config[:validation_client_name] %>"
+ @echo.client_key "c:/chef/etc/client.pem"
+ @echo.validation_key "c:/chef/etc/validation.pem"
+ @echo.checksum_path "c:/chef/var/checksums"
+ @echo.file_cache_path "c:/chef/var/cache"
+ @echo.file_backup_path "c:/chef/var/backup"
+ @echo.cache_options ^( {:path, "c:/chef/var/cache/checksums", :skip_expires, true} ^)
+<% if Chef::Config[:http_proxy] != nil %>
+ @echo.http_proxy       "<%= Chef::Config[:http_proxy] %>"
+<% end %>
+<% if Chef::Config[:https_proxy] != nil %>
+ @echo.https_proxy       "<%= Chef::Config[:https_proxy] %>"
+<% end %>
+<% if Chef::Config[:no_proxy] != nil %>
+ @echo.no_proxy          "<%= Chef::Config[:no_proxy] %>"
+<% end %>
+<% if @config[:chef_node_name] == nil %>
+ @echo.# Using default node name
+<% else %>
+ @echo.node_name "<%= @config[:chef_node_name] %>"
+<% end %> 
+)
+
+> c:/chef/etc/first-boot.json (
+ @echo.<%= { "run_list" => @run_list }.to_json %>
+)
+
+c:/ruby/bin/ruby c:/ruby/bin/chef-client -c c:/chef/etc/client.rb -j c:/chef/etc/first-boot.json -l <%= Chef::Config[:log_level] %>"

data/lib/chef/knife/configure_client.rb

@@ -31,7 +31,7 @@ class Chef
         end
 
         Chef::Log.info("Creating client configuration")
-        system("mkdir -p #{@config_dir}")
+        FileUtils.mkdir_p(@config_dir)
         Chef::Log.info("Writing client.rb")
         File.open(File.join(@config_dir, "client.rb"), "w") do |file|
           file.puts('log_level        :info')
@@ -40,7 +40,9 @@ class Chef
           file.puts("validation_client_name '#{Chef::Config[:validation_client_name]}'")
         end
         Chef::Log.info("Writing validation.pem")
-        system("cp #{Chef::Config[:validation_key]} #{File.join(@config_dir, 'validation.pem')}")
+        File.open(File.join(@config_dir, 'validation.pem'), "w") do |validation|
+          validation.puts(IO.read(Chef::Config[:validation_key]))
+        end
       end
 
     end

data/lib/chef/knife/cookbook_metadata.rb

@@ -55,7 +55,7 @@ class Chef
 
       def generate_metadata(cookbook)
         Chef::Log.info("Generating Metadata")
-        config[:cookbook_path].reverse.each do |path|
+        Array(config[:cookbook_path]).reverse.each do |path|
           file = File.expand_path(File.join(path, cookbook, 'metadata.rb'))
           generate_metadata_from_file(cookbook, file)
         end

data/lib/chef/knife/cookbook_site_share.rb

@@ -46,8 +46,9 @@ class Chef
         if cl.cookbook_exists?(cookbook_name)
           cookbook = cl[cookbook_name]
           Chef::CookbookUploader.validate_cookbook(cookbook)
-          tmp_cookbook_dir = Chef::CookbookUploader.create_build_dir(cookbook)
+          tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
           begin
+            Chef::Log.debug("temp cookbook directory is #{tmp_cookbook_dir.inspect}")
             Chef::Log.info("Making tarball #{cookbook_name}.tgz")
             Chef::Mixin::Command.run_command(:command => "tar -czf #{cookbook_name}.tgz #{cookbook_name}", :cwd => tmp_cookbook_dir)
           rescue => e

data/lib/chef/knife/cookbook_site_vendor.rb

@@ -45,6 +45,12 @@ class Chef
           config[:cookbook_path] = Chef::Config[:cookbook_path]
         end
 
+        # Check to ensure we have a valid source of cookbooks before continuing
+        unless File.directory?(config[:cookbook_path].first)
+          Chef::Log.error( File.join(config[:cookbook_path].first, " doesn't exist!.  Make sure you have cookbook_path configured correctly"))
+          exit 1
+        end
+
         vendor_path = File.expand_path(File.join(config[:cookbook_path].first))
         cookbook_path = File.join(vendor_path, name_args[0])
         upstream_file = File.join(vendor_path, "#{name_args[0]}.tar.gz")

data/lib/chef/knife/cookbook_test.rb

@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 require 'chef/knife'
-require 'chef/cache/checksum'
+require 'chef/checksum_cache'
 
 class Chef
   class Knife

data/lib/chef/knife/ec2_server_create.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'socket'
 require 'chef/knife'
 require 'json'
 
@@ -25,6 +26,8 @@ class Chef
 
       banner "knife ec2 server create [RUN LIST...] (options)"
 
+      attr_accessor :initial_sleep_delay
+
       option :flavor,
         :short => "-f FLAVOR",
         :long => "--flavor FLAVOR",
@@ -49,10 +52,15 @@ class Chef
         :description => "The Availability Zone",
         :default => "us-east-1b"
 
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
+
       option :ssh_key_name,
         :short => "-S KEY",
         :long => "--ssh-key KEY",
-        :description => "The SSH root key",
+        :description => "The AWS SSH key id",
         :proc => Proc.new { |key| Chef::Config[:knife][:aws_ssh_key_id] = key }
 
       option :ssh_user,
@@ -107,6 +115,25 @@ class Chef
         @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'
         require 'highline'
@@ -140,37 +167,21 @@ class Chef
 
         # wait for it to be ready to do stuff
         server.wait_for { print "."; ready? }
-        puts "#{h.color("\nWaiting 10 seconds for SSH Host Key generation on", :magenta)}: #{server.dns_name}"
-        sleep 10
 
-        print "\n"
+        puts("\n")
+
 
         puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
         puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
         puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
         puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
 
-        begin
-          bootstrap = Chef::Knife::Bootstrap.new
-          bootstrap.name_args = server.dns_name
-          bootstrap.config[:run_list] = @name_args
-          bootstrap.config[:ssh_user] = config[:ssh_user]
-          bootstrap.config[:identity_file] = config[:identity_file]
-          bootstrap.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.run
-        rescue Errno::ECONNREFUSED
-          puts h.color("Connection refused on SSH, retrying - CTRL-C to abort")
-          sleep 1
-          retry
-        rescue Errno::ETIMEDOUT
-          puts h.color("Connection timed out on SSH, retrying - CTRL-C to abort")
-          sleep 1
-          retry
-        end
+        print "\n#{h.color("Waiting for sshd", :magenta)}"
+
+        print(".") until tcp_test_ssh(server.dns_name) { sleep @initial_sleep_delay ||= 10; puts("done") }
+
+
+        bootstrap_for_node(server).run
 
         puts "\n"
         puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
@@ -185,7 +196,21 @@ class Chef
         puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
         puts "#{h.color("Run List", :cyan)}: #{@name_args.join(', ')}"
       end
+
+      def bootstrap_for_node(server)
+        bootstrap = Chef::Knife::Bootstrap.new
+        bootstrap.name_args = [server.dns_name]
+        bootstrap.config[:run_list] = @name_args
+        bootstrap.config[:ssh_user] = config[:ssh_user]
+        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
+      end
+
     end
   end
 end
-

data/lib/chef/knife/exec.rb

@@ -0,0 +1,52 @@
+#--
+# Author:: Daniel DeLeo (<dan@opscode.com)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef::Knife::Exec < Chef::Knife
+
+  banner "knife exec [SCRIPT] (options)"
+
+  option :exec,
+    :short => "-E CODE",
+    :long => "--exec CODE",
+    :description => "a string of Chef code to execute"
+
+  def late_load_deps
+    require 'chef/shef/ext'
+  end
+
+  def run
+    late_load_deps
+    scripts = Array(name_args)
+    context = Object.new
+    Shef::Extensions.extend_context_object(context)
+    if config[:exec]
+      context.instance_eval(config[:exec], "-E Argument", 0)
+    elsif !scripts.empty?
+      scripts.each do |script|
+        file = File.expand_path(script)
+        context.instance_eval(IO.read(file), file, 0)
+      end
+    else
+      script = STDIN.read
+      context.instance_eval(script, "STDIN", 0)
+    end
+  end
+  
+end