Skip to content

Commit

Permalink
Add support for testing CephFS and ceph-proxy.
Browse files Browse the repository at this point in the history
This change allows to use ceph-mon or ceph-proxy for testing ceph-fs.

Closes-Bug: https://pad.lv/1922195
  • Loading branch information
freyes committed Jun 17, 2023
1 parent edd7717 commit 4b7d971
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions zaza/openstack/charm_tests/ceph/fs/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down Expand Up @@ -69,9 +70,9 @@ def _mount_share(self, unit_name: str,
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),
Expand Down Expand Up @@ -176,6 +177,14 @@ def _change_conf_check(mds_config):
_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))
Expand Down

0 comments on commit 4b7d971

Please sign in to comment.