lib/beaker-pe/install/pe_utils.rb in beaker-pe-1.2.0 vs lib/beaker-pe/install/pe_utils.rb in beaker-pe-1.3.0
- old
+ new
@@ -423,11 +423,11 @@
# If we're installing a database version less than 3.0, ignore the database host
install_hosts.delete(database) if pre30database and database != master and database != dashboard
end
install_hosts.each do |host|
- #windows agents from 4.0 -> 2016.1.2 were only installable via aio method
- is_windows_msi_and_aio = (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.3.0') && !version_is_less(host['pe_ver'], '3.99') && !(host['roles'].include?('frictionless'))))
+ #windows agents from 4.0 -> 2016.1.2 were only installable via the aio method
+ is_windows_msi_and_aio = (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.3.0') && !version_is_less(host['pe_ver'], '3.99')))
if agent_only_check_needed && hosts_agent_only.include?(host) || is_windows_msi_and_aio
host['type'] = 'aio'
install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => host[:puppet_agent_version] || opts[:puppet_agent_version],
:puppet_agent_sha => host[:puppet_agent_sha] || opts[:puppet_agent_sha],