openstack/tripleo-heat-templates
Code Issues Proposed changes

docker-puppet: remove -z from /var/lib/config-data mount

Browse Source 
Context: https://github.com/containers/libpod/issues/1739
The relabeling of /var/lib/config-data fails with Podman and since we
run the docker-puppet containers with label=disable, we shouldn't need
to relabel it anyway.

Change-Id: I5e0715a9b7a052126fb01c8d2c3da36a38bec2bf
Related-Bug: #1800737
This commit is contained in:
Emilien Macchi 2018-11-01 14:25:57 -04:00
parent d5728ef0b1
commit 1b8618159e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-puppet.py
View File

@ -378,7 +378,7 @@ def mp_puppet_config(*args):
'--volume', '/etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro',
'--volume', '/etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro',
'--volume', '/etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro',
'--volume', '%s:/var/lib/config-data/:rw,z' % config_volume_prefix,
'--volume', '%s:/var/lib/config-data/:rw' % config_volume_prefix,
# Syslog socket for puppet logs
'--volume', '/dev/log:/dev/log:rw',
# script injection