File tree Expand file tree Collapse file tree 1 file changed +2
-8
lines changed
Expand file tree Collapse file tree 1 file changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -282,14 +282,8 @@ startVMPlaybook()
282282 sed -i -e " s/.*hosts:.*/ hosts: all/g" playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
283283 awk ' {print}/^\[defaults\]$/{print "private_key_file = id_rsa"; print "remote_tmp = $HOME/.ansible/tmp"; print "timeout = 60"}' < ansible.cfg > ansible.cfg.tmp && mv ansible.cfg.tmp ansible.cfg
284284
285- # Check if the OS is Solaris10 and add specific ssh-rsa algorithms
286- sshargs=" "
287- if [ " $OS " == " Solaris10" ]; then
288- sshargs=" --ssh-extra-args='-o PubkeyAcceptedKeyTypes=ssh-rsa -o HostKeyAlgorithms=ssh-rsa'"
289- fi
290-
291285 # Initialize the args variable with common arguments
292- args=" $verbosity -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b $sshargs --skip-tags adoptopenjdk,jenkins${skipFullSetup} "
286+ args=" $verbosity -i playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx -u vagrant -b --skip-tags adoptopenjdk,jenkins${skipFullSetup} "
293287
294288 # # If CentOS6 Delegate Playbook Run To Vagrant Machine Itself For Compatibility
295289 if [ " $OS " == " CentOS6" ]; then
@@ -313,7 +307,7 @@ startVMPlaybook()
313307 exit 1
314308 fi
315309
316- if [ " $OS " == " Solaris10 " ] || [ " $OS " == " CentOS6" ]; then
310+ if [ " $OS " == " CentOS6" ]; then
317311 # Remove IP from known_hosts as the playbook installs an
318312 # alternate sshd which regenerates the host key infra#2244
319313 ssh-keygen -R $( cat playbooks/AdoptOpenJDK_Unix_Playbook/hosts.unx)
You can’t perform that action at this time.
0 commit comments