Code Review
/
apex-tripleo-heat-templates.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
2518394
)
Merge "Ensure /etc/ssh/ssh_known_hosts exist in docker config-data."
author
Jenkins
<jenkins@review.openstack.org>
Wed, 7 Jun 2017 17:57:36 +0000
(17:57 +0000)
committer
Gerrit Code Review
<review@openstack.org>
Wed, 7 Jun 2017 17:57:36 +0000
(17:57 +0000)
docker/docker-puppet.py
patch
|
blob
|
history
diff --git
a/docker/docker-puppet.py
b/docker/docker-puppet.py
index
49dd00c
..
d9d0c25
100755
(executable)
--- 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