Use device_mounted from ceph
This commit is contained in:
parent
7cc9aab281
commit
302373f4f9
|
@ -84,7 +84,7 @@ def config_changed():
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
e_mountpoint = config('ephemeral-unmount')
|
e_mountpoint = config('ephemeral-unmount')
|
||||||
if (e_mountpoint and filesystem_mounted(e_mountpoint)):
|
if (e_mountpoint and ceph.filesystem_mounted(e_mountpoint)):
|
||||||
umount(e_mountpoint)
|
umount(e_mountpoint)
|
||||||
|
|
||||||
osd_journal = config('osd-journal')
|
osd_journal = config('osd-journal')
|
||||||
|
@ -143,14 +143,6 @@ def reformat_osd():
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def device_mounted(dev):
|
|
||||||
return subprocess.call(['grep', '-wqs', dev + '1', '/proc/mounts']) == 0
|
|
||||||
|
|
||||||
|
|
||||||
def filesystem_mounted(fs):
|
|
||||||
return subprocess.call(['grep', '-wqs', fs, '/proc/mounts']) == 0
|
|
||||||
|
|
||||||
|
|
||||||
@hooks.hook('mon-relation-changed',
|
@hooks.hook('mon-relation-changed',
|
||||||
'mon-relation-departed')
|
'mon-relation-departed')
|
||||||
def mon_relation():
|
def mon_relation():
|
||||||
|
|
Loading…
Reference in New Issue