ceph-volume batch: Fix osd_ids passing and improve plan formatting

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2124aa57b355fb29dcfe13c643bc78b4011f15a6)

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/batch.py b/src/ceph-volume/ceph_volume/devices/lvm/batch.py
index cb4c2d96731fe9ec0200d3d3f31c8e99506af4ef..56c5a59f95c1e366454c27f38464c6628664ca74 100644 (file)
--- 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 97b15b73b5e6279eb66bd05602d47169730362e4..bb5b456aa71a4c8777e1106d656d57bbec6b767e 100644 (file)
--- 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 = """