diff --git a/README.md b/README.md index 297bc709c..faf4b6cc2 100644 --- a/README.md +++ b/README.md @@ -67,15 +67,6 @@ Operating systems and versions tested with the project: - Ubuntu Server 22.04 LTS and 20.04 LTS (`x86_64`) - macOS Monterey and Big Sur (Intel) -> **Note** -> -> Update your `/etc/ssh/ssh_config` or `~/.ssh/ssh_config` to allow ssh authentication with RSA keys if you are using VMware Photon OS 4.0 or Ubuntu 22.04. -> -> Update to include the following: -> -> `HostKeyAlgorithms +ssh-rsa` -> `PubKeyAcceptedAlgorithms +ssh-rsa` - **Packer**: - HashiCorp [Packer][packer-install] 1.8.4 or higher. diff --git a/builds/linux/debian/11/linux-debian.pkr.hcl b/builds/linux/debian/11/linux-debian.pkr.hcl index f2722e6f2..5b211392c 100644 --- a/builds/linux/debian/11/linux-debian.pkr.hcl +++ b/builds/linux/debian/11/linux-debian.pkr.hcl @@ -173,6 +173,9 @@ build { "ANSIBLE_CONFIG=${path.cwd}/ansible/ansible.cfg", "ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3" ] + ansible_ssh_extra_args = [ + "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa" + ] extra_arguments = [ "--extra-vars", "display_skipped_hosts=false", "--extra-vars", "BUILD_USERNAME=${var.build_username}", diff --git a/builds/linux/photon/4/linux-photon.pkr.hcl b/builds/linux/photon/4/linux-photon.pkr.hcl index 376e05840..e3fc19e81 100644 --- a/builds/linux/photon/4/linux-photon.pkr.hcl +++ b/builds/linux/photon/4/linux-photon.pkr.hcl @@ -161,6 +161,9 @@ build { "ANSIBLE_CONFIG=${path.cwd}/ansible/ansible.cfg", "ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3" ] + ansible_ssh_extra_args = [ + "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa" + ] extra_arguments = [ "--extra-vars", "display_skipped_hosts=false", "--extra-vars", "BUILD_USERNAME=${var.build_username}", diff --git a/builds/linux/ubuntu/22-04-lts/linux-ubuntu.pkr.hcl b/builds/linux/ubuntu/22-04-lts/linux-ubuntu.pkr.hcl index 30a94fe08..917b95bb9 100644 --- a/builds/linux/ubuntu/22-04-lts/linux-ubuntu.pkr.hcl +++ b/builds/linux/ubuntu/22-04-lts/linux-ubuntu.pkr.hcl @@ -166,6 +166,9 @@ build { ansible_env_vars = [ "ANSIBLE_CONFIG=${path.cwd}/ansible/ansible.cfg" ] + ansible_ssh_extra_args = [ + "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa" + ] extra_arguments = [ "--extra-vars", "display_skipped_hosts=false", "--extra-vars", "BUILD_USERNAME=${var.build_username}",