Merge "Disable pid file usage in the swift_rsync container"

docker/services/swift-storage.yaml

@@ -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