openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Do not ignore Swift ring changes to trigger container restart 

Swift containers need to restart if the rings change. In
non-containerized environments this is not required, because the Swift
processes will reload the rings on any changes. However, this does not
work within containers, thus a restart is required.

This also restarts swift_copy_rings and swift_setup_srv container. This
will copy the updated ring files and ensure new storage mount points are
using the right permissions.

Closes-Bug: 1802066
Related-Bug: 1786065
Change-Id: Ie2b9f003dc34f2f02a45293d06d6a40c8d5ed8ff
This commit is contained in:
Christian Schwede 2018-11-07 08:53:48 +01:00
parent 85f5ec6609
commit b49629f085
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/docker-puppet.py
View File

@ -362,10 +362,10 @@ if not os.path.exists(sh_script):
excluded_original_passwords+=" --exclude=/var/lib/config-data/*${p}"
fi
done
# We need to exclude the swift rings and their backup as those change over time and
# We need to exclude the swift ring backups as those change over time and
# containers do not need to restart if they change
EXCLUDE=--exclude='*/etc/swift/backups/*'\ --exclude='*/etc/swift/*.ring.gz'\ --exclude='*/etc/swift/*.builder'\ --exclude='*/etc/libvirt/passwd.db'\ ${excluded_original_passwords}
EXCLUDE=--exclude='*/etc/swift/backups/*'\ --exclude='*/etc/libvirt/passwd.db'\ ${excluded_original_passwords}
# We need to repipe the tar command through 'tar xO' to force text
# output because otherwise the sed command cannot work. The sed is
# needed because puppet puts timestamps as comments in cron and