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 <dfarrell@redhat.com>

diff --git a/packer/provision/config_ssh.sh b/packer/provision/config_ssh.sh
deleted file mode 100644 (file)
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 ad186ea1a20448de7e786682a0f0a3febdadfc03..2d1dec75dce053a688e6dbc93dda6dd9786144bd 100644 (file)
--- 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 b78f6115c8a215c988a3b4b48be18ff27fb118e9..1fe29dbb77e43d5023d34681a82349f244fa8e49 100644 (file)
--- 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 1957dd3e6f97b1b6e432d958c6bcc3d54d776b9b..516b6771e49372f0a4401d9229f9d55404955390 100644 (file)
--- 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"
             ]