From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 7 Jun 2017 17:57:36 +0000 (+0000)
Subject: Merge "Ensure /etc/ssh/ssh_known_hosts exist in docker config-data."
X-Git-Tag: opnfv-6.0.0~593
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b932aeef518dcb76f8c4d759270e39a3fc89483f;hp=2518394c2f45d5514946de962f8dfd13aa7c7377;p=apex-tripleo-heat-templates.git

Merge "Ensure /etc/ssh/ssh_known_hosts exist in docker config-data."
---

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