From 2b7ff497fe9e0e167ab01bf0d8ce5e26f0da836f Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 25 Oct 2017 18:57:28 -0400 Subject: [PATCH] ceph-volume lvm.activate consume cluster_name from lvm metadata Signed-off-by: Alfredo Deza --- src/ceph-volume/ceph_volume/devices/lvm/activate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index 7d626a093019c..63dd8be0e6c85 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -19,6 +19,7 @@ def activate_filestore(lvs): if not osd_lv: raise RuntimeError('Unable to find a data LV for filestore activation') osd_id = osd_lv.tags['ceph.osd_id'] + conf.cluster = osd_lv.tags['ceph.cluster_name'] # it may have a volume with a journal osd_journal_lv = lvs.get(lv_tags={'ceph.type': 'journal'}) # TODO: add sensible error reporting if this is ever the case @@ -84,6 +85,7 @@ def activate_bluestore(lvs): # find the osd osd_lv = lvs.get(lv_tags={'ceph.type': 'block'}) osd_id = osd_lv.tags['ceph.osd_id'] + conf.cluster = osd_lv.tags['ceph.cluster_name'] osd_fsid = osd_lv.tags['ceph.osd_fsid'] db_device_path = get_osd_device_path(osd_lv, lvs, 'db') wal_device_path = get_osd_device_path(osd_lv, lvs, 'wal') -- 2.39.5