chef 0.10.2 → 0.10.4.rc.1

data/distro/common/html/chef-client.8.html

@@ -120,9 +120,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#x61;&#100;&#97;&#109;&#64;&#x6f;&#115;&#112;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#x40;&#111;&#x73;&#112;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#x6f;&#x6d;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#97;&#100;&#x61;&#x6d;&#x40;&#111;&#x73;&#x70;&#99;&#111;&#100;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#115;&#112;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;</a> of Opscode
 (http://www.opscode.com),  with contributions from the community.  This
-manual page was written by Joshua Timberman  <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#x6a;&#111;&#115;&#x68;&#117;&#x61;&#x40;&#111;&#112;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#x6f;&#109;</a>  with
+manual page was written by Joshua Timberman  <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#106;&#x6f;&#115;&#104;&#x75;&#x61;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#106;&#111;&#115;&#104;&#x75;&#x61;&#64;&#111;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#109;</a>  with
 help2man.  Permission  is  granted  to copy, distribute and / or modify
 this document under the terms of the Apache 2.0 License.</p>
 
@@ -131,8 +131,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.2</li>
-    <li class='tc'>June 2011</li>
+    <li class='tl'>Chef 0.10.0</li>
+    <li class='tc'>April 2011</li>
     <li class='tr'>chef-client(8)</li>
   </ol>
 

data/distro/common/html/knife-cookbook.1.html

@@ -143,6 +143,8 @@
 <dl>
 <dt><code>-a</code>, <code>--all</code></dt><dd>upload all cookbooks, rather than just a single cookbook</dd>
 <dt><code>-o</code>, <code>--cookbook-path path:path</code></dt><dd>a colon-separated path to look for cookbooks in</dd>
+<dt><code>-d</code>, <code>--upload-dependencies</code></dt><dd>Uploads additional cookbooks that this cookbook lists in as
+dependencies in its metadata.</dd>
 <dt><code>-E</code>, <code>--environment ENVIRONMENT</code></dt><dd>An <em>ENVIRONMENT</em> to apply the uploaded cookbooks to. Specifying this
 option will cause knife to edit the <em>ENVIRONMENT</em> to place a strict
 version constraint on the cookbook version(s) uploaded.</dd>
@@ -350,11 +352,11 @@ cookbook.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#x61;&#100;&#97;&#109;&#x40;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#97;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#58;&#106;&#111;&#115;&#104;&#x75;&#97;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#x61;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#106;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -364,7 +366,7 @@ cookbook.</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>Chef 0.10.0</li>
-    <li class='tc'>April 2011</li>
+    <li class='tc'>May 2011</li>
     <li class='tr'>knife-cookbook(1)</li>
   </ol>
 

data/distro/common/html/knife-node.1.html

@@ -247,11 +247,11 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#x61;&#100;&#97;&#109;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#x40;&#111;&#x70;&#115;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#x6a;&#111;&#115;&#x68;&#117;&#x61;&#x40;&#111;&#112;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#x6f;&#109;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -260,8 +260,8 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.2</li>
-    <li class='tc'>June 2011</li>
+    <li class='tl'>Chef 0.10.0</li>
+    <li class='tc'>April 2011</li>
     <li class='tr'>knife-node(1)</li>
   </ol>
 

data/distro/common/man/man1/knife-cookbook.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK" "1" "April 2011" "Chef 0.10.0" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "May 2011" "Chef 0.10.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\fR \- upload and manage chef cookbooks
@@ -82,6 +82,10 @@ upload all cookbooks, rather than just a single cookbook
 a colon\-separated path to look for cookbooks in
 .
 .TP
+\fB\-d\fR, \fB\-\-upload\-dependencies\fR
+Uploads additional cookbooks that this cookbook lists in as dependencies in its metadata\.
+.
+.TP
 \fB\-E\fR, \fB\-\-environment ENVIRONMENT\fR
 An \fIENVIRONMENT\fR to apply the uploaded cookbooks to\. Specifying this option will cause knife to edit the \fIENVIRONMENT\fR to place a strict version constraint on the cookbook version(s) uploaded\.
 .

data/distro/common/man/man1/knife-node.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-NODE" "1" "June 2011" "Chef 0.10.2" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "April 2011" "Chef 0.10.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure

data/distro/common/markdown/man1/knife-cookbook-site.mkd

@@ -11,8 +11,8 @@ __knife__ __cookbook site__ _sub-command_ _(options)_
 ## INSTALL
 __cookbook site install COOKBOOK [VERSION]__ _(options)_
 
-  * `-d`, `--dependencies`:
-    Grab dependencies automatically
+  * `-D`, `--no-dependencies `:
+    Do not install dependencies automatically
 
 Uses git(1) version control in conjunction with the cookbook site to
 install community contributed cookbooks to your local cookbook
@@ -31,7 +31,7 @@ changes as a separate patch.  When an updated upstream version becomes
 available, you will be able to merge the upstream changes while
 maintaining your local modifications.
 
-If _-d_ is specified, the process is applied recursively to all the
+Unless _-D_ is specified, the process is applied recursively to all the
 cookbooks _COOKBOOK_ depends on (via metadata _dependencies_).
 
 ## DOWNLOAD

data/distro/common/markdown/man1/knife-cookbook.mkd

@@ -46,6 +46,9 @@ __knife cookbook upload [cookbooks...]__ _(options)_
     upload all cookbooks, rather than just a single cookbook
   * `-o`, `--cookbook-path path:path`:
     a colon-separated path to look for cookbooks in
+  * `-d`, `--upload-dependencies`:
+    Uploads additional cookbooks that this cookbook lists in as
+    dependencies in its metadata.
   * `-E`, `--environment ENVIRONMENT`:
     An _ENVIRONMENT_ to apply the uploaded cookbooks to. Specifying this
     option will cause knife to edit the _ENVIRONMENT_ to place a strict
@@ -63,6 +66,10 @@ Uploads one or more cookbooks from your local cookbook repository(ies)
 to the Chef Server. Only files that don't yet exist on the server will
 be uploaded.
 
+As the command parses the name args as 1..n cookbook names:
+    `knife cookbook upload COOKBOOK COOKBOOK ...`
+works for one to many cookbooks.
+
 ## DOWNLOAD
 __knife cookbook download cookbook [version]__ _(options)_
 

data/distro/common/markdown/man1/knife-node.mkd

@@ -102,13 +102,14 @@ __knife node show__ _node name_ _(options)_
 
 Displays the node identified by _node name_ on stdout. The amount of
 content displayed and the output format are modified by the --format
-option. Valid formats are:
+option. If no alternate format is selected, the default is summary. 
+Valid formats are:
 
   * summary:
-    displays the node in a custom, summarized format
+    displays the node in a custom, summarized format (default)
   * text
     displays the node data in its entirety using the colorized tree
-display
+display 
   * json:
     displays the node in JSON format
   * yaml:

data/distro/common/markdown/man1/knife-ssh.mkd

@@ -15,6 +15,8 @@ __knife__ __ssh QUERY COMMAND__ _(options)_
     The ssh password
   * `-x`, `--ssh-user USERNAME    `:
     The ssh username
+  * `-i`, `--identity-file IDENTITY_FILE`:
+    The SSH identity file used for authentication
 
 ## DESCRIPTION
 

data/lib/chef/application.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'socket'
 require 'chef/config'
 require 'chef/exceptions'
 require 'chef/log'

data/lib/chef/cookbook_loader.rb

@@ -30,6 +30,8 @@ class Chef
 
     attr_accessor :metadata
     attr_reader :cookbooks_by_name
+    attr_reader :merged_cookbooks
+    attr_reader :cookbook_paths
 
     include Enumerable
 
@@ -39,9 +41,23 @@ class Chef
       @cookbooks_by_name = Mash.new
       @loaded_cookbooks = {}
       @metadata = Mash.new
+      @cookbooks_paths = Hash.new {|h,k| h[k] = []} # for deprecation warnings
+
+      # Used to track which cookbooks appear in multiple places in the cookbook repos
+      # and are merged in to a single cookbook by file shadowing. This behavior is
+      # deprecated, so users of this class may issue warnings to the user by checking
+      # this variable
+      @merged_cookbooks = []
+
       load_cookbooks
     end
 
+    def merged_cookbook_paths # for deprecation warnings
+      merged_cookbook_paths = {}
+      @merged_cookbooks.each {|c| merged_cookbook_paths[c] = @cookbooks_paths[c]}
+      merged_cookbook_paths
+    end
+
     def load_cookbooks
       cookbook_settings = Hash.new
       @repo_paths.each do |repo_path|
@@ -52,7 +68,9 @@ class Chef
           loader = Cookbook::CookbookVersionLoader.new(cookbook_path, chefignore)
           loader.load_cookbooks
           next if loader.empty?
+          @cookbooks_paths[loader.cookbook_name] << cookbook_path # for deprecation warnings
           if @loaded_cookbooks.key?(loader.cookbook_name)
+            @merged_cookbooks << loader.cookbook_name # for deprecation warnings
             @loaded_cookbooks[loader.cookbook_name].merge!(loader)
           else
             @loaded_cookbooks[loader.cookbook_name] = loader

data/lib/chef/cookbook_uploader.rb

@@ -134,7 +134,7 @@ class Chef
           RestClient::Resource.new(url, :headers=>headers, :timeout=>1800, :open_timeout=>1800).put(file_contents)
           checksums_to_upload.delete(checksum)
         rescue RestClient::Exception => e
-          ui.error("Failed to upload #@cookbook : #{e.message}\n#{e.response.body}")
+          Chef::Knife.ui.error("Failed to upload #@cookbook : #{e.message}\n#{e.response.body}")
           raise
         end
       end

data/lib/chef/data_bag.rb

@@ -152,9 +152,21 @@ class Chef
       (couchdb || Chef::CouchDB.new).load("data_bag", name)
     end
 
-    # Load a Data Bag by name via the RESTful API
+    # Load a Data Bag by name via either the RESTful API or local data_bag_path if run in solo mode
     def self.load(name)
-      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{name}")
+      if Chef::Config[:solo]
+        unless File.directory?(Chef::Config[:data_bag_path])
+          raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{Chef::Config[:data_bag_path]}' is invalid"
+        end
+
+        Dir.glob(File.join(Chef::Config[:data_bag_path], name, "*.json")).inject({}) do |bag, f|
+          item = JSON.parse(IO.read(f))
+          bag[item['id']] = item
+          bag
+        end
+      else
+        Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{name}")
+      end
     end
 
     # Remove this Data Bag from CouchDB

data/lib/chef/data_bag_item.rb

@@ -187,9 +187,15 @@ class Chef
       (couchdb || Chef::CouchDB.new).load("data_bag_item", object_name(data_bag, name))
     end
 
-    # Load a Data Bag Item by name via RESTful API
+    # Load a Data Bag Item by name via either the RESTful API or local data_bag_path if run in solo mode
     def self.load(data_bag, name)
-      item = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{data_bag}/#{name}")
+      if Chef::Config[:solo]
+        bag = Chef::DataBag.load(data_bag)
+        item = bag[name]
+      else
+        item = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{data_bag}/#{name}")
+      end
+
       if item.kind_of?(DataBagItem)
         item
       else

data/lib/chef/encrypted_data_bag_item.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2010 Opscode, Inc.
+# Copyright:: Copyright 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,7 @@ require 'base64'
 require 'openssl'
 require 'chef/data_bag_item'
 require 'yaml'
+require 'open-uri'
 
 # An EncryptedDataBagItem represents a read-only data bag item where
 # all values, except for the value associated with the id key, have
@@ -56,7 +57,7 @@ class Chef::EncryptedDataBagItem
 
   def [](key)
     value = @enc_hash[key]
-    if key == "id"
+    if key == "id" || value.nil?
       value
     else
       self.class.decrypt_value(value, @secret)
@@ -103,10 +104,22 @@ class Chef::EncryptedDataBagItem
 
   def self.load_secret(path=nil)
     path = path || Chef::Config[:encrypted_data_bag_secret] || DEFAULT_SECRET_FILE
-    if !File.exists?(path)
-      raise Errno::ENOENT, "file not found '#{path}'"
-    end
-    secret = IO.read(path).strip
+    secret = case path
+             when /^\w+:\/\//
+               # We have a remote key
+               begin
+                 Kernel.open(path).read.strip
+               rescue Errno::ECONNREFUSED
+                 raise ArgumentError, "Remote key not available from '#{path}'"
+               rescue OpenURI::HTTPError
+                 raise ArgumentError, "Remote key not found at '#{path}'"
+               end
+             else
+               if !File.exists?(path)
+                 raise Errno::ENOENT, "file not found '#{path}'"
+               end
+               IO.read(path).strip
+             end
     if secret.size < 1
       raise ArgumentError, "invalid zero length secret in '#{path}'"
     end

data/lib/chef/environment.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Stephen Delano (<stephen@opscode.com>)
 # Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: John Keiser (<jkeiser@ospcode.com>)
 # Copyright:: Copyright 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -398,12 +399,17 @@ class Chef
 
     def self.cdb_load_filtered_recipe_list(name, couchdb=nil)
       cdb_load_filtered_cookbook_versions(name, couchdb).map do |cb_name, cb|
-        cb.first.recipe_filenames_by_name.keys.map do |recipe|
-          case recipe
-          when DEFAULT
-            cb_name
-          else
-            "#{cb_name}::#{recipe}"
+        if cb.empty?            # no available versions
+          []                    # empty list elided with flatten
+        else
+          latest_version = cb.first
+          latest_version.recipe_filenames_by_name.keys.map do |recipe|
+            case recipe
+            when DEFAULT
+              cb_name
+            else
+              "#{cb_name}::#{recipe}"
+            end
           end
         end
       end.flatten

data/lib/chef/exceptions.rb

@@ -76,6 +76,7 @@ class Chef
     class EnclosingDirectoryDoesNotExist < ArgumentError; end
 
     class ObsoleteDependencySyntax < ArgumentError; end
+    class InvalidDataBagPath < ArgumentError; end
 
     # A different version of a cookbook was added to a
     # VersionedRecipeList than the one already there.

data/lib/chef/knife.rb

@@ -497,34 +497,6 @@ class Chef
       self.msg("Deleted #{obj_name}")
     end
 
-    def bulk_delete(klass, fancy_name, delete_name=nil, list=nil, regex=nil, &block)
-      object_list = list ? list : klass.list(true)
-
-      if regex
-        to_delete = Hash.new
-        object_list.each_key do |object|
-          next if regex && object !~ /#{regex}/
-          to_delete[object] = object_list[object]
-        end
-      else
-        to_delete = object_list
-      end
-
-      output(format_list_for_display(to_delete))
-
-      confirm("Do you really want to delete the above items")
-
-      to_delete.each do |name, object|
-        if Kernel.block_given?
-          block.call(name, object)
-        else
-          object.destroy
-        end
-        output(format_for_display(object)) if config[:print_after]
-        self.msg("Deleted #{fancy_name} #{name}")
-      end
-    end
-
     def rest
       @rest ||= begin
         require 'chef/rest'

data/lib/chef/knife/bootstrap.rb

@@ -72,6 +72,11 @@ class Chef
         :description => "The version of Chef to install",
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
 
+      option :bootstrap_proxy,
+        :long => "--bootstrap-proxy PROXY_URL",
+        :description => "The proxy server for the node being bootstrapped",
+        :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
+
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
@@ -110,6 +115,7 @@ class Chef
           bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap', "#{config[:distro]}.erb")
           bootstrap_files << File.join(Dir.pwd, ".chef", "bootstrap", "#{config[:distro]}.erb")
           bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb")
+          bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb"))
         end
 
         template = Array(bootstrap_files).find do |bootstrap_template|
@@ -166,6 +172,7 @@ class Chef
 
       def knife_ssh
         ssh = Chef::Knife::Ssh.new
+        ssh.ui = ui
         ssh.name_args = [ server_name, ssh_command ]
         ssh.config[:ssh_user] = config[:ssh_user]
         ssh.config[:ssh_password] = config[:ssh_password]

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

@@ -1,4 +1,6 @@
 bash -c '
+<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+
 if [ ! -f /usr/bin/chef-client ]; then
   pacman -Syy
   pacman -S --noconfirm ruby ntp base-devel
@@ -10,7 +12,7 @@ fi
 mkdir -p /etc/chef
 (
 cat <<'EOP'
-<%= IO.read(Chef::Config[:validation_key]) %>
+<%= validation_key %>
 EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
@@ -20,21 +22,22 @@ 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 %>
+chef_server_url  "<%= @chef_config[:chef_server_url] %>"
+validation_client_name "<%= @chef_config[:validation_client_name] %>"
+<% if @config[:chef_node_name] -%>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
-<% if Chef::Config[:environment] != nil %>
-environment "<%= Chef::Config[:environment]%>"
-<% end %>
+<% else -%>
+# Using default node name (fqdn)
+<% 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})
+<% if knife_config[:bootstrap_proxy] %>
+http_proxy         "<%= knife_config[:bootstrap_proxy] %>"
+https_proxy        "<%= knife_config[:bootstrap_proxy] %>"
+<% end -%>
 EOP
 ) > /etc/chef/client.rb
 
@@ -44,5 +47,4 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/first-boot.json
 
-/usr/bin/chef-client -j /etc/chef/first-boot.json
-'
+<%= start_chef %>'