commit 8e7a4577c72b6f308f485d4f2a0e1945e9eef107
author tjaroszyk <tjaroszyk@mirantis.com> Tue Apr 07 08:32:21 2020 +0000
committer Gerrit Code Review <mail@domain.com> Tue Apr 07 08:32:21 2020 +0000
tree a7d90925683ca058f03801203859b9c9b126f74e
parent cb2aa79b6c9786ba72394d4688bb22b6633d2019
parent 5e99c0f627804713a00bdba3a0b48029d78b369c

Merge "refactoring - return the same grains regardless of ceph version. add fsid"

_grains/ceph.py

diff --git a/_grains/ceph.py b/_grains/ceph.py
index 981ec18..e9f38a6 100644
--- a/_grains/ceph.py
+++ b/_grains/ceph.py
@@ -34,6 +34,8 @@
                 try:
                     with open('/var/lib/ceph/osd/%s/whoami' % osd) as file:
                         dev_id = file.readline().strip()
+                    with open('/var/lib/ceph/osd/%s/fsid' % osd) as file:
+                        fsid = file.readline().strip()
                     path = os.readlink('/var/lib/ceph/osd/%s/block' % osd)
                 except IOError:
                     continue            
@@ -46,6 +48,7 @@
                     cmd = "pvs  | grep %s | awk '{print $1}'" % path.split('/')[-2]
                     dev = check_output(cmd, shell=True).strip()
                 devices[dev_id] = {}
+                devices[dev_id]['fsid'] = fsid
                 devices[dev_id]['path'] = path
                 devices[dev_id]['dev'] = dev