From caff8ec1a32cb14cf6646d262b8e238d4c55aaf6 Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Thu, 3 Aug 2017 09:14:19 -0400 Subject: [PATCH] Remove Packer ssh-"fixing" logic This logic was adding because of a problem with upstream Fedora boxes that seems to be fixed now (SSH doesn't hang forever without this). Also this config now breaks because the file it's editing doesn't exist. Change-Id: I9adb10f5fea7f47d3b4ee95549839c7fd18a0ff1 Signed-off-by: Daniel Farrell --- packer/provision/config_ssh.sh | 14 -------------- packer/templates/docker.json | 1 - packer/templates/libvirt.json | 1 - packer/templates/virtualbox.json | 1 - 4 files changed, 17 deletions(-) delete mode 100644 packer/provision/config_ssh.sh diff --git a/packer/provision/config_ssh.sh b/packer/provision/config_ssh.sh deleted file mode 100644 index f0376c7..0000000 --- a/packer/provision/config_ssh.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# Recent versions of OpenSSH don't support ssh-dss as an auth protocol -# ODL seems offers ssh-dss by default. To SSH to the Karaf shell, tell -# SSH to accept ssh-dss. Alternatively, tell SSH to accept ssh-dss via -# the HostKeyAlgorithms option at invocation. -# ssh -p 8101 -oHostKeyAlgorithms=+ssh-dss karaf@localhost - -# Options: -# -x: Echo commands -# -e: Fail on errors -set -ex - -# Accept ssh-dss as an SSH algorithm by appending config to end of file -sudo sed -i -e "\$aHostKeyAlgorithms=+ssh-dss" /etc/ssh/ssh_config diff --git a/packer/templates/docker.json b/packer/templates/docker.json index ad186ea..2d1dec7 100644 --- a/packer/templates/docker.json +++ b/packer/templates/docker.json @@ -21,7 +21,6 @@ "scripts": [ "provision/config_docker_{{ user `os_name`}}.sh", "provision/config_ansible_{{ user `os_name`}}.sh", - "provision/config_ssh.sh", "provision/cleanup_{{ user `os_name`}}.sh", "provision/minimize.sh" ] diff --git a/packer/templates/libvirt.json b/packer/templates/libvirt.json index b78f611..1fe29db 100644 --- a/packer/templates/libvirt.json +++ b/packer/templates/libvirt.json @@ -30,7 +30,6 @@ "scripts": [ "provision/config_vagrant.sh", "provision/config_ansible_{{ user `os_name`}}.sh", - "provision/config_ssh.sh", "provision/cleanup_{{ user `os_name`}}.sh", "provision/minimize.sh" ] diff --git a/packer/templates/virtualbox.json b/packer/templates/virtualbox.json index 1957dd3..516b677 100644 --- a/packer/templates/virtualbox.json +++ b/packer/templates/virtualbox.json @@ -48,7 +48,6 @@ "provision/config_virtualbox_{{ user `os_name`}}.sh", "provision/config_vagrant.sh", "provision/config_ansible_{{ user `os_name`}}.sh", - "provision/config_ssh.sh", "provision/cleanup_{{ user `os_name`}}.sh", "provision/minimize.sh" ] -- 2.36.6