From 547dfe646e185b0a41582c5773d4328c99c1f353 Mon Sep 17 00:00:00 2001 From: Jianxin Li Date: Tue, 26 Jul 2022 02:56:18 +0000 Subject: [PATCH] cluster/ceph.py: add monmaptool_cmd to to adapt self-compiled ceph Signed-off-by: Jianxin Li --- cluster/ceph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index 46bdbc35..c29dd101 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -99,6 +99,7 @@ def __init__(self, config): self.ceph_mgr_cmd = config.get('ceph-mgr_cmd', '/usr/bin/ceph-mgr') self.ceph_mds_cmd = config.get('ceph-mds_cmd', '/usr/bin/ceph-mds') self.ceph_authtool_cmd = config.get('ceph-authtool_cmd', '/usr/bin/ceph-authtool') + self.monmaptool_cmd = config.get('monmaptool_cmd', '/usr/bin/monmaptool') self.radosgw_admin_cmd = config.get('radosgw-admin_cmd', '/usr/bin/radosgw-admin') self.ceph_cmd = config.get('ceph_cmd', '/usr/bin/ceph') self.ceph_fuse_cmd = config.get('ceph-fuse_cmd', '/usr/bin/ceph-fuse') @@ -347,7 +348,7 @@ def make_mons(self): common.pdsh(settings.getnodes('head', 'clients', 'osds', 'mons', 'rgws', 'mgrs'), 'sudo sh -c \'%s --print-key %s > %s\'' % (self.ceph_authtool_cmd, self.client_keyring, self.client_secret)).communicate() # Build the monmap, retrieve it, and distribute it mons = settings.getnodes('mons').split(',') - cmd = 'monmaptool --create --clobber' + cmd = '%s --create --clobber' % self.monmaptool_cmd monhosts = self.get_mon_hosts() logger.info(monhosts) for monhost, mons in monhosts.items():