starlingx
/
integ
Code Issues Proposed changes

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<daniel.badea@windriver.com>
This commit is contained in:
Daniel Badea 2019-09-11 16:24:41 +00:00
parent 4b6a275e4f
commit edc7f8495d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/ceph/files/mgr-restful-plugin.py
View File

@ -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,