openstack
/
charm-ceph-mon
Code Issues Proposed changes

Enable functional tests for train 

This patch also provides a fix from the last charms.ceph sync to fix
random issue with ceph >= 14.

Change-Id: I8aa03e073442c2eaa1c979562f68c435c229db16
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@canonical.com>
This commit is contained in:
Sahid Orentino Ferdjaoui 2019-10-22 13:12:31 +00:00
parent 2e3631c6c8
commit 86536fb52a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/ceph_hooks.py
View File

@ -300,6 +300,8 @@ def config_changed():
log("Couldn't bootstrap the monitor yet: {}".format(str(e)))
return
ceph.wait_for_bootstrap()
ceph.wait_for_quorum()
ceph.create_keyrings()
if cmp_pkgrevno('ceph', '12.0.0') >= 0:
status_set('maintenance', 'Bootstrapping single Ceph MGR')
ceph.bootstrap_manager()
@ -442,6 +444,7 @@ def mon_relation():
exit(0)
ceph.wait_for_bootstrap()
ceph.wait_for_quorum()
ceph.create_keyrings()
if cmp_pkgrevno('ceph', '12.0.0') >= 0:
status_set('maintenance', 'Bootstrapping Ceph MGR')
ceph.bootstrap_manager()

2
tests/tests.yaml
View File

@ -10,7 +10,7 @@ gate_bundles:
- xenial-mitaka
- trusty-mitaka
smoke_bundles:
- bionic-stein
- bionic-train
dev_bundles:
- cosmic-rocky
- disco-stein