pe_utils.rb in beaker-pe-2.11.5

- old
+ new

@@ -290,11 +290,11 @@
             end
             if opts[:fetch_local_then_push_to_host]
               fetch_and_push_pe(host, path, filename, extension)
             else
               curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
-              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
+              on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
             end
           end
         end
 
         #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
@@ -326,11 +326,11 @@
             if opts[:fetch_local_then_push_to_host]
               fetch_and_push_pe(host, path, filename, extension)
               on host, "cd #{host['working_dir']}; chmod 644 #{filename}#{extension}"
             elsif host.is_cygwin?
               curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
-              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
+              on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
             else
               on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['working_dir']}\\#{filename}#{extension}')")
             end
           end
         end
@@ -379,11 +379,11 @@
               if opts[:fetch_local_then_push_to_host]
                 fetch_and_push_pe(host, path, filename, extension)
                 command_file_push = 'cat '
               else
                 curlopts = opts[:use_proxy] ? "--proxy #{opts[:proxy_hostname]}:3128 " : ""
-                command_file_push = "curl #{curlopts}#{path}/"
+                command_file_push = "curl -L #{curlopts}#{path}/"
               end
               on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
 
             end
           end
@@ -659,10 +659,10 @@
           fetch_pe([master], opts)
           prepare_host_installer_options(master)
           register_feature_flags!(opts)
           generate_installer_conf_file_for(master, all_hosts, opts)
           step "Install PE on master" do
-            on master, installer_cmd(master, opts)
+            on master, installer_cmd(master, opts) if master['template'] !~ /-preload/
           end
 
           step "Stop agent on master" do
             stop_agent_on(master)
           end