ensure lockup_timeout > rsync_timeout

[Andrea Ieri]

Due to bug 1575277, lockup_timeout must always be greater than rsync_timeout. Failing to ensure that may also be the cause of bug 1691570.

Reference: https://docs.openstack.org/mitaka/config-reference/object-storage/object-server.html

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/742740

[Andrea Ieri (aieri)]

subscribed ~field-medium due to code contribution needing a review

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/742740
Committed: https://git.openstack.org/cgit/openstack/charm-swift-storage/commit/?id=66c14b2aff94baf5a5e8479c43c975c41e1098ca
Submitter: Zuul
Branch: master

commit 66c14b2aff94baf5a5e8479c43c975c41e1098ca
Author: Andrea Ieri <email address hidden>
Date: Thu Jul 23 15:57:46 2020 -0400

    Ensure lockup_timeout is never < 2*rsync_timeout

    Change-Id: Id0afc210b7be8ac7c740753ef06b51db0bae410c
    Closes-Bug: 1888725