openstack
/
charm-ceph-proxy
Code Issues Proposed changes

Tweak handling for OSD startup

This commit is contained in:
James Page 2013-08-27 14:05:25 +01:00
parent daff553f89
commit 40841e5372
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hooks/ceph.py
View File

@ -123,13 +123,13 @@ def is_osd_disk(dev):
def start_osds(devices): def start_osds(devices):
if get_ceph_version() < "0.56.6": # Scan for ceph block devices
# Only supports block devices - force a rescan rescan_osd_devices()
rescan_osd_devices() if get_ceph_version() >= "0.56.6":
else: # Use ceph-disk-activate for directory based OSD's
# Use ceph-disk-activate for later ceph versions
for dev_or_path in devices: for dev_or_path in devices:
if os.path.exists(dev_or_path): if (os.path.exists(dev_or_path) and
os.path.isdir(dev_or_path)):
subprocess.check_call(['ceph-disk-activate', dev_or_path]) subprocess.check_call(['ceph-disk-activate', dev_or_path])

2
revision
View File

@ -1 +1 @@
97 98