Merge pull request #40 from jpartlow/issue/master/pe-18516-always-set…

…-pe-conf-for-upgrades

(PE-18516,PE-18170) Temporarily set pe.conf when upgrading to Flanders

lib/beaker-pe/install/pe_utils.rb

@@ -123,9 +123,13 @@ def installer_cmd(host, opts)
               pe_cmd += " -y"
             end
 
+            # This is a temporary workaround for PE-18516, because MEEP does not yet create a 2.0
+            # pe.conf when recovering configuration in Flanders. This will be fixed in PE-18170.
+            if opts[:type] == :upgrade && !version_is_less(host['pe_upgrade_ver'], '2017.1.0')
+              "#{pe_cmd} #{host['pe_installer_conf_setting']}"
             # If there are no answer overrides, and we are doing an upgrade from 2016.2.0,
             # we can assume there will be a valid pe.conf in /etc that we can re-use.
-            if opts[:answers].nil? && opts[:custom_answers].nil? && opts[:type] == :upgrade && !version_is_less(opts[:HOSTS][host.name][:pe_ver], '2016.2.0')
+            elsif opts[:answers].nil? && opts[:custom_answers].nil? && opts[:type] == :upgrade && !version_is_less(opts[:HOSTS][host.name][:pe_ver], '2016.2.0')
               "#{pe_cmd}"
             else
               "#{pe_cmd} #{host['pe_installer_conf_setting']}"