RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22724 from ceph/rm-23941

Browse Source 
ceph-volume: error on commands that need ceph.conf to operate

Reviewed-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2018-06-27 11:56:09 -04:00 committed by GitHub
commit 6e5e5bde30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,12 @@ from ceph_volume.decorators import catches
from ceph_volume import log, devices, configuration, conf, exceptions, terminal
IGNORE_CEPH_CONFIG_COMMANDS = [
"lvm list",
"lvm zap",
]
class Volume(object):
_help = """
ceph-volume: Deploy Ceph OSDs using different device technologies like lvm or
@ -149,11 +155,16 @@ Ceph Conf: {ceph_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)
is_help = "-h" in subcommand_args or "--help" in subcommand_args
if " ".join(subcommand_args[:2]) in IGNORE_CEPH_CONFIG_COMMANDS or is_help:
# 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)
else:
terminal.red(error)
raise
# dispatch to sub-commands
terminal.dispatch(self.mapper, subcommand_args)