Add support for testing CephFS and ceph-proxy.
This change allows to use ceph-mon or ceph-proxy for testing ceph-fs. Closes-Bug: https://pad.lv/1922195
This commit is contained in:
@@ -29,6 +29,7 @@ class CephFSTests(unittest.TestCase):
|
||||
|
||||
mounts_share = False
|
||||
mount_dir = '/mnt/cephfs'
|
||||
CEPH_MON = 'ceph-mon'
|
||||
|
||||
def tearDown(self):
|
||||
"""Cleanup after running tests."""
|
||||
@@ -69,9 +70,9 @@ class CephFSTests(unittest.TestCase):
|
||||
def _install_keyring(self, unit_name: str):
|
||||
|
||||
keyring = model.run_on_leader(
|
||||
'ceph-mon', 'cat /etc/ceph/ceph.client.admin.keyring')['Stdout']
|
||||
self.CEPH_MON, 'cat /etc/ceph/ceph.client.admin.keyring')['Stdout']
|
||||
config = model.run_on_leader(
|
||||
'ceph-mon', 'cat /etc/ceph/ceph.conf')['Stdout']
|
||||
self.CEPH_MON, 'cat /etc/ceph/ceph.conf')['Stdout']
|
||||
commands = [
|
||||
'sudo mkdir -p /etc/ceph',
|
||||
"echo '{}' | sudo tee /etc/ceph/ceph.conf".format(config),
|
||||
@@ -176,6 +177,14 @@ class CephFSTests(unittest.TestCase):
|
||||
_change_conf_check(mds_config)
|
||||
|
||||
|
||||
class CephFSWithCephProxyTests(CephFSTests):
|
||||
"""Extend CephFSTests to use ceph-proxy instead of ceph-mon."""
|
||||
|
||||
# when ceph-proxy is being used it will be the one acting as a ceph-mon
|
||||
# for the other charms holding the admin key and ceph.conf
|
||||
CEPH_MON = 'ceph-proxy'
|
||||
|
||||
|
||||
def _indent(text, amount, ch=' '):
|
||||
padding = amount * ch
|
||||
return ''.join(padding+line for line in text.splitlines(True))
|
||||
|
||||
Reference in New Issue
Block a user