RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 06:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume: return osd_id from util.prepare.check_id if it exists

Browse Source 
This also changes this so the osd_id is returned as a string so
an ID of 0 would evaluate to True.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
This commit is contained in:
Andrew Schoen 2018-01-30 09:21:47 -06:00
parent 548eadeec6
commit 699aa65878
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ceph-volume/ceph_volume/util/prepare.py
View File

@ -73,12 +73,12 @@ def create_id(fsid, json_secrets):
def check_id(osd_id):
"""
Checks to see if an osd ID exists or not. Returns True
Checks to see if an osd ID exists or not. Returns osd_id
if it does exist, False if it doesn't.
:param osd_id: The osd ID to check
"""
if not osd_id:
if osd_id is None:
return False
bootstrap_keyring = '/var/lib/ceph/bootstrap-osd/%s.keyring' % conf.cluster
stdout, stderr, returncode = process.call(
@ -98,7 +98,11 @@ def check_id(osd_id):
output = json.loads(stdout)
osds = output['nodes']
return any([osd['id'] == osd_id for osd in osds])
found_osd = any([str(osd['id']) == str(osd_id) for osd in osds])
if found_osd:
# return a string so an ID of 0 evaluates to True
return str(osd_id)
return False
def mount_tmpfs(path):