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)
Reviewed: https:/ /review. openstack. org/551933 /git.openstack. org/cgit/ openstack/ charm-ceph- mon/commit/ ?id=79e27a7b2d7 388bcd0e955ffb2 130f36da8d11ea
Committed: https:/
Submitter: Zuul
Branch: stable/18.02
commit 79e27a7b2d7388b cd0e955ffb2130f 36da8d11ea
Author: Frode Nordahl <email address hidden>
Date: Fri Mar 9 15:51:13 2018 +0100
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: I914be8a5a7dcd9 676438de92bba7f 91283232837 dbb3dc0fe853e87 097812eff8)
Closes-Bug: #1719436
(cherry picked from commit 8134a12bc512369