install_sh.rb in chef-provisioning-2.7.4

- old
+ new

@@ -19,10 +19,11 @@
         @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
+        @chef_command = convergence_options[:chef_command] || "chef-client"
       end
 
       attr_reader :client_rb_path
       attr_reader :chef_version
       attr_reader :prerelease
@@ -43,10 +44,17 @@
 
         if convergence_options[:install_sh_arguments]
           opts['install_flags'] = convergence_options[:install_sh_arguments]
         end
 
+        # Install::ScriptGenerator will use current by default, unless we specify -c stable
+        # So we add this install flag unless 'prerelease' was specified, in which case we do not
+        if (not opts['install_flags'].nil?) and (not opts['install_flags'].include?('-c ')) and (not opts['install_flags'].include?('-channel ') and (not prerelease))
+          opts['install_flags']='' unless opts['install_flags'].nil?
+          opts['install_flags']+=' -c stable'
+        end
+
         install_command = Mixlib::Install::ScriptGenerator.new(chef_version, false, opts).install_command
         machine.write_file(action_handler, install_sh_path, install_command, :ensure_dir => true)
         machine.set_attributes(action_handler, install_sh_path, :mode => '0755')
         machine.execute(action_handler, "sh -c #{install_sh_path}")
       end
@@ -54,11 +62,11 @@
       def converge(action_handler, machine)
         super
 
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
-            command_line = "chef-client"
-            command_line << " -c #{@client_rb_path} -l #{config[:log_level].to_s}" if config[:log_level]
+            command_line = "#{@chef_command} -c #{@client_rb_path}"
+            command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
             machine.execute(action_handler, command_line,
               :stream_stdout => stdout,
               :stream_stderr => stderr,
               :timeout => @chef_client_timeout)
           end