From 326df6de7192568d9fd38c9425fdaf7e1a30c27b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 10 Feb 2022 02:23:51 +0100 Subject: [PATCH] ceph-volume/activate: load the config from lv tag When `ceph-volume lvm trigger` is called with an OSD where the tag `ceph.cluster_name` is not 'ceph', it fails. Signed-off-by: Guillaume Abrioux (cherry picked from commit 5ac1ec65cb2a582b2ae550202cc9911f993943f2) --- src/ceph-volume/ceph_volume/devices/lvm/activate.py | 2 ++ .../ceph_volume/tests/devices/lvm/test_activate.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index 70fceeab64572..cdd60ed62000c 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -153,6 +153,8 @@ def activate_bluestore(osd_lvs, no_systemd=False): osd_id = osd_block_lv.tags['ceph.osd_id'] conf.cluster = osd_block_lv.tags['ceph.cluster_name'] osd_fsid = osd_block_lv.tags['ceph.osd_fsid'] + configuration.load_ceph_conf_path(osd_block_lv.tags['ceph.cluster_name']) + configuration.load() # mount on tmpfs the osd directory osd_path = '/var/lib/ceph/osd/%s-%s' % (conf.cluster, osd_id) diff --git a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py index 9b8fcbebeaef9..cb72fbb625cea 100644 --- a/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py +++ b/src/ceph-volume/ceph_volume/tests/devices/lvm/test_activate.py @@ -214,6 +214,7 @@ class TestActivate(object): assert fake_start_osd.calls != [] def test_bluestore_no_systemd(self, is_root, monkeypatch, capture): + monkeypatch.setattr('ceph_volume.configuration.load', lambda: None) fake_enable = Capture() fake_start_osd = Capture() monkeypatch.setattr('ceph_volume.util.system.path_is_mounted', lambda *a, **kw: True) @@ -236,6 +237,7 @@ class TestActivate(object): assert fake_start_osd.calls == [] def test_bluestore_systemd(self, is_root, monkeypatch, capture): + monkeypatch.setattr('ceph_volume.configuration.load', lambda: None) fake_enable = Capture() fake_start_osd = Capture() monkeypatch.setattr('ceph_volume.util.system.path_is_mounted', lambda *a, **kw: True) @@ -259,6 +261,7 @@ class TestActivate(object): assert fake_start_osd.calls != [] def test_bluestore_no_systemd_autodetect(self, is_root, monkeypatch, capture): + monkeypatch.setattr('ceph_volume.configuration.load', lambda: None) fake_enable = Capture() fake_start_osd = Capture() monkeypatch.setattr('ceph_volume.util.system.path_is_mounted', lambda *a, **kw: True) @@ -282,6 +285,7 @@ class TestActivate(object): assert fake_start_osd.calls == [] def test_bluestore_systemd_autodetect(self, is_root, monkeypatch, capture): + monkeypatch.setattr('ceph_volume.configuration.load', lambda: None) fake_enable = Capture() fake_start_osd = Capture() monkeypatch.setattr('ceph_volume.util.system.path_is_mounted', -- 2.39.5