lib/beaker-pe/install/pe_utils.rb in beaker-pe-2.1.7 vs lib/beaker-pe/install/pe_utils.rb in beaker-pe-2.1.8
- old
+ new
@@ -221,10 +221,11 @@
# For UNIX machines using the full PE installer, the host object must have the 'pe_installer' field set correctly.
# @param [Hash{Symbol=>String}] opts The options
# @option opts [String] :pe_ver Default PE version to install or upgrade to
# (Otherwise uses individual hosts pe_ver)
# @option opts [Boolean] :pe_debug (false) Should we run the installer in debug mode?
+ # @option opts [Boolean] :interactive (false) Should we run the installer in interactive mode?
# @example
# on host, "#{installer_cmd(host, opts)} -a #{host['working_dir']}/answers"
# @api private
def installer_cmd(host, opts)
version = host['pe_ver'] || opts[:pe_ver]
@@ -239,10 +240,10 @@
elsif host['platform'] =~ /eos/
host.install_from_file("puppet-enterprise-#{version}-#{host['platform']}.swix")
else
pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -D' : ''
pe_cmd = "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug}"
- if ! version_is_less(host['pe_ver'], '2016.2.1')
+ if ! version_is_less(host['pe_ver'], '2016.2.1') && ! opts[:interactive]
# -y option sets "assume yes" mode where yes or whatever default will be assumed
pe_cmd += " -y"
end
# If we are doing an upgrade from 2016.2.0,