From edc7f8495db315d654a5844c525024adffc0439d Mon Sep 17 00:00:00 2001 From: Daniel Badea Date: Wed, 11 Sep 2019 16:24:41 +0000 Subject: [PATCH] ceph: mgr-restful-plugin set ceph-mgr config file path Explicitly set ceph-mgr configuration file path to /etc/ceph/ceph.conf to avoid surprises. ceph-mon and ceph-osd are also started with '-c' (--conf) pointing to /etc/ceph/ceph.conf. Change-Id: I4915952f17b4d96a8fce3b4b96335693f9b6c76b Closes-bug: 1843082 Signed-off-by: Daniel Badea --- ceph/ceph/files/mgr-restful-plugin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ceph/ceph/files/mgr-restful-plugin.py b/ceph/ceph/files/mgr-restful-plugin.py index d92737a7e..a679e5a99 100644 --- a/ceph/ceph/files/mgr-restful-plugin.py +++ b/ceph/ceph/files/mgr-restful-plugin.py @@ -73,6 +73,7 @@ class Config(object): self.log_dir = '/var/log' self.ceph_mgr_service = '/usr/bin/ceph-mgr' + self.ceph_mgr_config = '/etc/ceph/ceph.conf' self.ceph_mgr_cluster = 'ceph' self.ceph_mgr_rundir = '/var/run/ceph/mgr' self.ceph_mgr_confdir = '/var/lib/ceph/mgr' @@ -700,6 +701,7 @@ class ServiceMonitor(object): self.ceph_mgr = psutil.Popen( [CONFIG.ceph_mgr_service, '--cluster', CONFIG.ceph_mgr_cluster, + '--conf', CONFIG.ceph_mgr_config, '--id', CONFIG.ceph_mgr_identity, '-f'], close_fds=True,