openstack
/
charm-ceph-osd
Code Issues Proposed changes

Sync charms.ceph to get fix 

Change-Id: Ib3d4b79690eb5931b4f0680b937590b317a91427
Closes-Bug: #1841021
This commit is contained in:
taodd 2019-09-24 18:19:38 +08:00
parent 1badeacdc4
commit 7772560510
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ceph/utils.py
View File

@ -1912,9 +1912,10 @@ def osdize_dir(path, encrypt=False, bluestore=False):
' skipping'.format(path))
return
if os.path.exists(os.path.join(path, 'upstart')):
log('Path {} is already configured as an OSD - bailing'.format(path))
return
for t in ['upstart', 'systemd']:
if os.path.exists(os.path.join(path, t)):
log('Path {} is already used as an OSD dir - bailing'.format(path))
return
if cmp_pkgrevno('ceph', "0.56.6") < 0:
log('Unable to use directories for OSDs with ceph < 0.56.6',