lib/chef/provisioning/convergence_strategy/install_sh.rb in chef-provisioning-1.1.0 vs lib/chef/provisioning/convergence_strategy/install_sh.rb in chef-provisioning-1.1.1
- old
+ new
@@ -62,10 +62,10 @@
end
end
# Install chef client
# TODO ssh verification of install.sh before running arbtrary code would be nice?
- if convergence_options[:bootstrap_proxy].empty?
+ if !convergence_options[:bootstrap_proxy] || convergence_options[:bootstrap_proxy].empty?
@@install_sh_cache[install_sh_url] ||= Net::HTTP.get(URI(install_sh_url))
else
@@install_sh_cache[install_sh_url] ||= begin
proxy_uri = URI.parse(convergence_options[:bootstrap_proxy])
chef_uri = URI.parse(@install_sh_url)