diff options
| author | sersut <serdar@opscode.com> | 2014-05-08 13:33:21 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-05-12 11:08:01 -0700 |
| commit | 5d1339cd07b9326ab446a92f95ac12f664e61c0e (patch) | |
| tree | 6f83f4ba47b6c9ebb96fe5b3a6148b0b93b93ad4 /lib/chef/knife/bootstrap | |
| parent | 34a2e6e8bae46e2b7eb83135d4d40318792ad85a (diff) | |
| download | chef-5d1339cd07b9326ab446a92f95ac12f664e61c0e.tar.gz | |
Change chef-full bootstrap template to install the current latest version of the workstation version to resolve errors while bootstrapping with a pre-release version.
Diffstat (limited to 'lib/chef/knife/bootstrap')
| -rw-r--r-- | lib/chef/knife/bootstrap/chef-full.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/bootstrap/chef-full.erb b/lib/chef/knife/bootstrap/chef-full.erb index c0b8d54dad..c953a7e433 100644 --- a/lib/chef/knife/bootstrap/chef-full.erb +++ b/lib/chef/knife/bootstrap/chef-full.erb @@ -27,9 +27,9 @@ exists() { if ! exists /usr/bin/chef-client; then echo "Installing Chef Client..." if exists wget; then - bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> <%= knife_config[:bootstrap_wget_options] %> ${install_sh} -O -) ${version_string} + bash <(wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %> <%= knife_config[:bootstrap_wget_options] %> ${install_sh} -O -) <%= latest_current_chef_version_string %> elif exists curl; then - bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> <%= knife_config[:bootstrap_curl_options] %> ${install_sh}) ${version_string} + bash <(curl -L <%= "--proxy \"#{knife_config[:bootstrap_proxy]}\" " if knife_config[:bootstrap_proxy] %> <%= knife_config[:bootstrap_curl_options] %> ${install_sh}) <%= latest_current_chef_version_string %> else echo "Neither wget nor curl found. Please install one and try again." >&2 exit 1 |