From 2124aa57b355fb29dcfe13c643bc78b4011f15a6 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Fri, 19 Jun 2020 11:22:28 +0200 Subject: [PATCH] ceph-volume batch: Fix osd_ids passing and improve plan formatting Signed-off-by: Jan Fajerski --- src/ceph-volume/ceph_volume/devices/lvm/batch.py | 2 +- src/ceph-volume/ceph_volume/util/templates.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/batch.py b/src/ceph-volume/ceph_volume/devices/lvm/batch.py index cb4c2d96731fe..56c5a59f95c1e 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/batch.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/batch.py @@ -523,7 +523,7 @@ class Batch(object): 'block_wal_size': self.very_fast[2], }) if self.id_: - plan.update({'osd_id': self.osd_id}) + plan.update({'osd_id': self.id_}) return plan def get_args(self, defaults): diff --git a/src/ceph-volume/ceph_volume/util/templates.py b/src/ceph-volume/ceph_volume/util/templates.py index 97b15b73b5e62..bb5b456aa71a4 100644 --- a/src/ceph-volume/ceph_volume/util/templates.py +++ b/src/ceph-volume/ceph_volume/util/templates.py @@ -12,7 +12,7 @@ osd_reused_id = """ osd_component = """ - {_type: <15} {path: <55} {size: <15} {percent:.2%}%""" + {_type: <15} {path: <55} {size: <15} {percent:.2%}""" total_osds = """ -- 2.39.5