f4e68a4...
by
OpenDev Sysadmins <email address hidden>
OpenDev Migration Patch
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:
Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.
Increase timeout and remove empty keyring for ceph-create-keys
Sync relevant changes from charms.ceph.
Default timeout of ceph-create-keys of 600 seconds is not
adequate in all circumstances.
When ceph-create-keys times out it leaves a empty keyring.
The retry attempt will fail as long as the empty keyring exists.
Remove it before retry attempt.
Change-Id: I914be8a5a7dcd9676438de92bba7f91283232837
Closes-Bug: #1719436
(cherry picked from commit 8134a12bc512369dbb3dc0fe853e87097812eff8)