aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorOliver Walsh <owalsh@redhat.com>2017-06-06 21:16:38 +0100
committerOliver Walsh <owalsh@redhat.com>2017-06-07 12:16:01 +0100
commite7b7d4a0e3cda477324553df74ed1c98985a8a88 (patch)
tree5a12edee73a40bc9090274f41f6d9ec9df8d58b6 /docker
parent01c44271e8bea07ce875dec19baa48714389acd8 (diff)
Ensure /etc/ssh/ssh_known_hosts exist in docker config-data.
Works around the issue encountered in 1696283. Change-Id: I1947d9d1e3cabc5dfe25ee1af994d684425bdbf7 Resolves-Bug: #1696283
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-puppet.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 49dd00cd..d9d0c255 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -176,6 +176,10 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
mkdir -p /var/lib/config-data/${NAME}/etc
cp -a /etc/* /var/lib/config-data/${NAME}/etc/
+ # workaround LP1696283
+ mkdir -p /var/lib/config-data/${NAME}/etc/ssh
+ touch /var/lib/config-data/${NAME}/etc/ssh/ssh_known_hosts
+
if [ -d /root/ ]; then
cp -a /root/ /var/lib/config-data/${NAME}/root/
fi