From a88cbfc73a258b51b20e060e269234962444ce63 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 19 Sep 2018 12:04:41 -0400 Subject: [PATCH] ceph-volume lvm.activate load the config always by reading the cluster name from the LV Signed-off-by: Alfredo Deza --- src/ceph-volume/ceph_volume/devices/lvm/activate.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index 6faebaec38f6e..28b81dda6115d 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -3,7 +3,7 @@ import argparse import logging import os from textwrap import dedent -from ceph_volume import process, conf, decorators, terminal, __release__ +from ceph_volume import process, conf, decorators, terminal, __release__, configuration from ceph_volume.util import system, disk from ceph_volume.util import prepare as prepare_utils from ceph_volume.util import encryption as encryption_utils @@ -24,7 +24,8 @@ def activate_filestore(lvs, no_systemd=False): is_vdo = osd_lv.tags.get('ceph.vdo', '0') osd_id = osd_lv.tags['ceph.osd_id'] - conf.cluster = osd_lv.tags['ceph.cluster_name'] + configuration.load_ceph_conf_path(osd_lv.tags['ceph.cluster_name']) + configuration.load() # 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 -- 2.39.5