From ff8122ec461daa5603fa5d3a38164fb90910c13b Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Mon, 27 Nov 2017 14:02:42 +0000 Subject: [PATCH] Ensure rsyncd PID file is removed during overcloud updates During an overcloud update it might happen that the rsyncd container gets killed & restarted, leaving a PID file from rsyncd. rsyncd won't start because of this, which results in a container restarting loop. This patch ensures the PID file is absent to fix this. Closes-Bug: 1734674 Change-Id: Ie5b28005f1079e432cfca6c31d28295174e06986 (cherry picked from commit 570c95741200a31c5e6a3ff36447625e1cb398c7) --- docker/services/swift-storage.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 84dbc43cf1..8f5e933b2c 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -515,3 +515,8 @@ outputs: - name: Restart xinetd service after rsync removal tags: step2 service: name=xinetd state=restarted + update_tasks: + - name: Ensure rsyncd pid file is absent + file: + path: /var/run/rsyncd.pid + state: absent