openstack
/
charm-ceph-mon
Code Issues Proposed changes

sync with last charms.ceph 

* 7839ca3 put create_keyrings as a public method

Change-Id: Ia090d4c37e19016a8468ce62113b2531c69de0e5
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@canonical.com>
This commit is contained in:
Sahid Orentino Ferdjaoui 2019-10-24 09:57:32 +00:00
parent f69c296d2b
commit 2e3631c6c8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ceph/utils.py
View File

@ -29,7 +29,6 @@ from datetime import datetime
from charmhelpers.core import hookenv
from charmhelpers.core import templating
from charmhelpers.core.decorators import retry_on_exception
from charmhelpers.core.host import (
chownr,
cmp_pkgrevno,
@ -1295,7 +1294,6 @@ def bootstrap_monitor_cluster(secret):
path,
done,
init_marker)
_create_keyrings()
except:
raise
finally:
@ -1343,10 +1341,11 @@ def _create_monitor(keyring, secret, hostname, path, done, init_marker):
service_restart('ceph-mon-all')
@retry_on_exception(3, base_delay=5)
def _create_keyrings():
def create_keyrings():
"""Create keyrings for operation of ceph-mon units
NOTE: The quorum should be done before to execute this function.
:raises: Exception if keyrings cannot be created
"""
if cmp_pkgrevno('ceph', '14.0.0') >= 0: