install_utils.rb in beaker-1.11.2

- old
+ new

@@ -189,13 +189,13 @@
       #                  (Otherwise uses individual hosts pe_ver)
       # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                  (Otherwise uses individual Windows hosts pe_ver)
       # @api private
       def fetch_puppet_on_windows(host, opts)
-        path = opts[:pe_dir] || host['pe_dir']
+        path = host['pe_dir'] || opts[:pe_dir]
         local = File.directory?(path)
-        version = opts[:pe_ver_win] || host['pe_ver']
+        version = host['pe_ver'] || opts[:pe_ver_win]
         filename = "puppet-enterprise-#{version}"
         extension = ".msi"
         if local
           if not File.exists?("#{path}/#{filename}#{extension}")
             raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
@@ -217,10 +217,10 @@
       #                  (Otherwise uses individual hosts pe_dir)
       # @option opts [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
       # @api private
       def fetch_puppet_on_unix(host, opts)
-        path = opts[:pe_dir] || host['pe_dir']
+        path = host['pe_dir'] || opts[:pe_dir]
         local = File.directory?(path)
         filename = "#{host['dist']}"
         if local
           extension = File.exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
           if not File.exists?("#{path}/#{filename}#{extension}")