diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-07 17:57:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-07 17:57:36 +0000 |
| commit | b932aeef518dcb76f8c4d759270e39a3fc89483f (patch) | |
| tree | 3dcd9d8c2a5e7def4716b7b4c615d6ea6bbe8d1a | |
| parent | 2518394c2f45d5514946de962f8dfd13aa7c7377 (diff) | |
| parent | e7b7d4a0e3cda477324553df74ed1c98985a8a88 (diff) | |
Merge "Ensure /etc/ssh/ssh_known_hosts exist in docker config-data."
| -rwxr-xr-x | docker/docker-puppet.py | 4 |
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 |