lib/beaker-pe/install/pe_utils.rb in beaker-pe-2.11.11 vs lib/beaker-pe/install/pe_utils.rb in beaker-pe-2.11.12
- old
+ new
@@ -137,11 +137,11 @@
end
#Return true if tlsv1 protocol needs to be enforced
#param [Host] the host
def require_tlsv1?(host)
- tlsv1_platforms = [/aix/, /el-5/, /solaris-1[0,1]-[i,x]/, /sles-11/,/windows-2008/]
+ tlsv1_platforms = [/el-5/, /solaris-1[0,1]-[i,x]/, /sles-11/,/windows-2008/]
return tlsv1_platforms.any? {|platform_regex| host['platform'] =~ platform_regex}
end
# Generate the command line string needed to from a frictionless puppet-agent
# install on this host in a PE environment.
@@ -209,10 +209,10 @@
if version_is_less(pe_version, '2019.1.0') || require_tlsv1?(host)
curl_opts << '--tlsv1'
end
if use_puppet_ca_cert
curl_opts << '--cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem'
- elsif host['platform'] !~ /aix/
+ else
curl_opts << '-k'
end
cmd = "FRICTIONLESS_TRACE='true'; export FRICTIONLESS_TRACE; cd #{host['working_dir']} && curl #{curl_opts.join(' ')} https://#{downloadhost}:8140/packages/current/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
end