aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 23:33:19 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 23:33:19 +0000
commitad3d0da798addf6905957029bdbdfe2d509cc008 (patch)
tree7986398bb1955ca230d5f2649bee466ed48b618e /docker
parent10c53f61891756e40e7bd1fc536df25e051485ae (diff)
parent74595a73210bb9cf5e0d688c57e9fa5423422603 (diff)
Merge "Make a copy of files touched by puppet in container"
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/docker-puppet.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 4d9d40d4..13211676 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -208,6 +208,13 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
done
rsync -a -R --delay-updates --delete-after $rsync_srcs /var/lib/config-data/${NAME}
+ # Also make a copy of files modified during puppet run
+ # This is useful for debugging
+ mkdir -p /var/lib/config-data/puppet-generated/${NAME}
+ rsync -a -R -0 --delay-updates --delete-after \
+ --files-from=<(find $rsync_srcs -newer /etc/ssh/ssh_known_hosts -print0) \
+ / /var/lib/config-data/puppet-generated/${NAME}
+
# Write a checksum of the config-data dir, this is used as a
# salt to trigger container restart when the config changes
tar cf - /var/lib/config-data/${NAME} | md5sum | awk '{print $1}' > /var/lib/config-data/${NAME}.md5sum