openstack/tripleo-heat-templates
Code Issues Proposed changes

Exclude /etc/openldap to avoid overriding ro file

Browse Source 
Currently /etc/openldap is bind-mounted by keystone containers
with ro flag so it should be excluded from config files generaed
by puppet.

Closes-Bug: #1960781
Change-Id: I8027b829e6b5aebfcd36f5025bb9c848cc96ce3f
This commit is contained in:
Yamato Tanaka 2022-02-14 17:02:36 +09:00
parent 6e31f952e3
commit daa48254eb
1 changed files with 3 additions and 1 deletions

4
common/container-puppet.sh

@ -102,7 +102,9 @@ if [ -z "$NO_ARCHIVE" ]; then
ro_files="/etc/puppet/ /etc/puppetlabs/ /opt/puppetlabs/ /etc/pki/ca-trust/extracted "
ro_files+="/etc/pki/ca-trust/source/anchors /etc/pki/tls/certs/ca-bundle.crt "
ro_files+="/etc/pki/tls/certs/ca-bundle.trust.crt /etc/pki/tls/cert.pem "
ro_files+="/etc/hosts /etc/localtime /etc/hostname"
ro_files+="/etc/hosts /etc/localtime /etc/hostname "
# /etc/openldap is bind mounted with "ro" option in keystone containers.
ro_files+="/etc/openldap"
for ro in $ro_files; do
if [ -e "$ro" ]; then
exclude_files+=" --exclude=$ro"