From 3b6d82afe7ee83283b25cefda00c7a59cf5144af Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 5 Oct 2018 10:45:35 -0500 Subject: [PATCH] ceph-volume: remove the used_by_ceph key in the json output Signed-off-by: Andrew Schoen --- .../ceph_volume/devices/lvm/strategies/bluestore.py | 6 +++--- .../ceph_volume/devices/lvm/strategies/filestore.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py index 33b5b547e30..0b54447a356 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py @@ -77,7 +77,7 @@ class SingleType(object): osds = self.computed['osds'] for device in self.hdds: for hdd in range(self.osds_per_device): - osd = {'data': {}, 'block.db': {}, 'used_by_ceph': device.used_by_ceph} + osd = {'data': {}, 'block.db': {}} osd['data']['path'] = device.abspath osd['data']['size'] = device.sys_api['size'] / self.osds_per_device osd['data']['parts'] = self.osds_per_device @@ -90,7 +90,7 @@ class SingleType(object): for device in self.ssds: extents = lvm.sizing(device.sys_api['size'], parts=self.osds_per_device) for ssd in range(self.osds_per_device): - osd = {'data': {}, 'block.db': {}, 'used_by_ceph': device.used_by_ceph} + osd = {'data': {}, 'block.db': {}} osd['data']['path'] = device.abspath osd['data']['size'] = extents['sizes'] osd['data']['parts'] = extents['parts'] @@ -223,7 +223,7 @@ class MixedType(object): for device in self.hdds: for hdd in range(self.osds_per_device): - osd = {'data': {}, 'block.db': {}, 'used_by_ceph': device.used_by_ceph} + osd = {'data': {}, 'block.db': {}} osd['data']['path'] = device.abspath osd['data']['size'] = device.sys_api['size'] / self.osds_per_device osd['data']['percentage'] = 100 / self.osds_per_device diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py index 72a379a6b24..2960f75fec0 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py @@ -110,7 +110,7 @@ class SingleType(object): journal_size = self.journal_size data_size = osd_size - journal_size data_percentage = data_size * 100 / device_size - osd = {'data': {}, 'journal': {}, 'used_by_ceph': device.used_by_ceph} + osd = {'data': {}, 'journal': {}} osd['data']['path'] = device.abspath osd['data']['size'] = data_size.b.as_int() osd['data']['parts'] = self.osds_per_device @@ -328,7 +328,7 @@ class MixedType(object): for osd in range(self.osds_per_device): device_size = disk.Size(b=device.sys_api['size']) data_size = device_size / self.osds_per_device - osd = {'data': {}, 'journal': {}, 'used_by_ceph': device.used_by_ceph} + osd = {'data': {}, 'journal': {}} osd['data']['path'] = device.path osd['data']['size'] = data_size.b.as_int() osd['data']['percentage'] = 100 / self.osds_per_device -- 2.47.3