diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-08-21 16:18:32 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-08-26 15:42:26 -0700 |
| commit | b03b2aa547e6c9766d9ed39e29351540209c7b06 (patch) | |
| tree | 668bff138214602ff1fb3024cba43abdb5d17cb2 /lib/chef/knife/bootstrap.rb | |
| parent | 63c044871c93c9ed3fa80536a036dc8642a78d0e (diff) | |
| download | chef-b03b2aa547e6c9766d9ed39e29351540209c7b06.tar.gz | |
Fixes based on the PR comments.
Diffstat (limited to 'lib/chef/knife/bootstrap.rb')
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index d081a6b4d3..4440443821 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -75,6 +75,10 @@ class Chef :long => "--node-name NAME", :description => "The Chef node name for your new node" + option :prerelease, + :long => "--prerelease", + :description => "Install the pre-release chef gems" + option :bootstrap_version, :long => "--bootstrap-version VERSION", :description => "The version of Chef to install", @@ -189,7 +193,10 @@ class Chef template = Chef::Config[:knife][:bootstrap_template] # Use the template directly if it's a path to an actual file - return template if File.exists?(template) + if File.exists?(template) + Chef::Log.debug("Using the specified bootstrap template: #{File.dirname(bootstrap_template)}") + return template + end # Otherwise search the template directories until we find the right one |