RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume main warn on inability to load ceph.conf, don't raise

Browse Source 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2017-12-05 13:58:53 -05:00
parent 559c54f9c2
commit 44c768db0d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ceph-volume/ceph_volume/main.py
View File

@ -136,10 +136,18 @@ Ceph Conf: {ceph_path}
if os.path.isdir(conf.log_path):
conf.log_path = os.path.join(args.log_path, 'ceph-volume.log')
log.setup()
logger = logging.getLogger(__name__)
# set all variables from args and load everything needed according to
# them
self.load_ceph_conf_path(cluster_name=args.cluster)
conf.ceph = configuration.load(conf.path)
try:
conf.ceph = configuration.load(conf.path)
except exceptions.ConfigurationError as error:
# we warn only here, because it is possible that the configuration
# file is not needed, or that it will be loaded by some other means
# (like reading from lvm tags)
logger.exception('ignoring inability to load ceph.conf')
terminal.red(error)
# dispatch to sub-commands
terminal.dispatch(self.mapper, subcommand_args)