Disable pid file usage in the swift_rsync container

The pidfile is useless within containers, but prevents a restart if the
process has been stopped unclean. This happens for example when a
restart takes longer than the default timeout of 10 seconds.

This is mainly a workaround because the pid file setting is hardcoded in
the used Puppet module template. It should be removed later once the
setting can be disabled cleanly with an updated Puppet rsync module.

Related-Bug: 1724559
Change-Id: Iecf855a785bc1f787234e4e54430c929cb9cb906
This commit is contained in:
Christian Schwede 2018-06-21 11:12:30 +00:00 committed by Christian Schwede
parent cd61dc0cf2
commit 448e04029e

View File

@ -210,6 +210,15 @@ outputs:
command: ['chown', '-R', 'swift:', '/srv/node']
volumes:
- /srv/node:/srv/node
# FIXME (cschwede): remove this once the pid file setting is disabled
swift_rsync_fix:
image: {get_param: DockerSwiftObjectImage}
net: host
user: root
detach: false
command: ['/bin/bash', '-c', 'sed -i "/pid file/d" /var/lib/kolla/config_files/src/etc/rsyncd.conf']
volumes:
- /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:rw
step_4:
swift_account_auditor:
image: *swift_account_image