From 6113b274e4447e753bc64a68b27e66885a4dc55b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 20 Mar 2015 12:46:36 -0400 Subject: [PATCH] Revert "Remove ssh host keys during image build" This reverts commit 1c04bff0d66b85cbdb74fa9ceaec6f1fa9f7ead4. Change-Id: I097b1cbeed3beedec3f64260676641244b22a2ea --- nodepool/elements/puppet/bin/prepare-node | 2 -- nodepool/scripts/prepare_node.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/nodepool/elements/puppet/bin/prepare-node b/nodepool/elements/puppet/bin/prepare-node index 37c90ac240..941265176f 100644 --- a/nodepool/elements/puppet/bin/prepare-node +++ b/nodepool/elements/puppet/bin/prepare-node @@ -58,5 +58,3 @@ set -e # Make sure resolv.conf settings don't break dib echo "nameserver $NODEPOOL_STATIC_NAMESERVER"> /etc/resolv.conf - -rm -f /etc/ssh/ssh_host_* diff --git a/nodepool/scripts/prepare_node.sh b/nodepool/scripts/prepare_node.sh index 9eea6f97c1..9b19331855 100755 --- a/nodepool/scripts/prepare_node.sh +++ b/nodepool/scripts/prepare_node.sh @@ -173,7 +173,5 @@ sudo -H virtualenv /usr/zuul-swift-logs-env sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \ requests glob2 -sudo rm -f /etc/ssh/ssh_host_* - sync sleep 5