starlingx/integ
Code Issues Proposed changes

Merge "ceph: mgr-restful-plugin set ceph-mgr config file path"

Browse Source
This commit is contained in:
Zuul 2019-09-11 18:16:56 +00:00 committed by Gerrit Code Review
commit d51e846143
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.log_dir = '/var/log'
self.ceph_mgr_service = '/usr/bin/ceph-mgr' self.ceph_mgr_service = '/usr/bin/ceph-mgr'
self.ceph_mgr_config = '/etc/ceph/ceph.conf'
self.ceph_mgr_cluster = 'ceph' self.ceph_mgr_cluster = 'ceph'
self.ceph_mgr_rundir = '/var/run/ceph/mgr' self.ceph_mgr_rundir = '/var/run/ceph/mgr'
self.ceph_mgr_confdir = '/var/lib/ceph/mgr' self.ceph_mgr_confdir = '/var/lib/ceph/mgr'
@ -700,6 +701,7 @@ class ServiceMonitor(object):
self.ceph_mgr = psutil.Popen( self.ceph_mgr = psutil.Popen(
[CONFIG.ceph_mgr_service, [CONFIG.ceph_mgr_service,
'--cluster', CONFIG.ceph_mgr_cluster, '--cluster', CONFIG.ceph_mgr_cluster,
'--conf', CONFIG.ceph_mgr_config,
'--id', CONFIG.ceph_mgr_identity, '--id', CONFIG.ceph_mgr_identity,
'-f'], '-f'],
close_fds=True, close_fds=True,