lib/chef/provisioning/convergence_strategy/install_sh.rb in chef-provisioning-1.4.1 vs lib/chef/provisioning/convergence_strategy/install_sh.rb in chef-provisioning-1.5.0
- old
+ new
@@ -12,21 +12,19 @@
convergence_options = Cheffish::MergedConfig.new(convergence_options, {
:client_rb_path => '/etc/chef/client.rb',
:client_pem_path => '/etc/chef/client.pem'
})
super(convergence_options, config)
- @install_sh_url = convergence_options[:install_sh_url] || 'https://www.chef.io/chef/install.sh'
@install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
@chef_version = convergence_options[:chef_version]
@prerelease = convergence_options[:prerelease]
@install_sh_arguments = convergence_options[:install_sh_arguments]
@bootstrap_env = convergence_options[:bootstrap_proxy] ? "http_proxy=#{convergence_options[:bootstrap_proxy]} https_proxy=$http_proxy " : ""
@chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
end
attr_reader :chef_version
attr_reader :prerelease
- attr_reader :install_sh_url
attr_reader :install_sh_path
attr_reader :install_sh_arguments
attr_reader :bootstrap_env
def setup_convergence(action_handler, machine)