Skip to content

Commit

Permalink
ceph-volume lvm.strategies use new template location in bluestore
Browse files Browse the repository at this point in the history
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8f7bca7)
  • Loading branch information
Alfredo Deza authored and andrewschoen committed Aug 28, 2018
1 parent 2fe91b1 commit 3a7cbab
Showing 1 changed file with 11 additions and 35 deletions.
46 changes: 11 additions & 35 deletions src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
Expand Up @@ -4,31 +4,7 @@
from ceph_volume.api import lvm
from . import validators
from ceph_volume.devices.lvm.create import Create

# TODO: get these templates out so filestore can re-use them

osd_header_template = """
{:-^80}""".format('')


osd_component_titles = """
Type Path LV Size % of device"""


osd_component_template = """
{_type: <15} {path: <25} {size: <15} {percent}%"""


header_template = """
Total OSDs: {total_osds}
"""

vg_template = """
Solid State VG:
Targets: {target: <25} Total size: {total_lv_size: <25}
Total LVs: {total_lvs: <25} Size per LV: {lv_size: <25}
Devices: {block_db_devices}
"""
from ceph_volume.util import templates


class SingleType(object):
Expand All @@ -50,14 +26,14 @@ def report_json(self):

def report_pretty(self):
string = ""
string += header_template.format(
string += templates.osd_header.format(
total_osds=len(self.hdds) or len(self.ssds) * 2
)
string += osd_component_titles
string += templates.osd_component_titles

for osd in self.computed['osds']:
string += osd_header_template
string += osd_component_template.format(
string += templates.osd_header
string += templates.osd_component.format(
_type='[data]',
path=osd['data']['path'],
size=osd['data']['human_readable_size'],
Expand Down Expand Up @@ -153,7 +129,7 @@ def report_pretty(self):
db_size = str(disk.Size(b=(vg_extents['sizes'])))

string = ""
string += header_template.format(
string += templates.osd_header.format(
targets='block.db',
total_lv_size=str(self.total_ssd_size),
total_lvs=vg_extents['parts'],
Expand All @@ -162,7 +138,7 @@ def report_pretty(self):
lv_size=str(disk.Size(b=(vg_extents['sizes']))),
total_osds=len(self.hdds)
)
string += vg_template.format(
string += templates.ssd_volume_group.format(
target='block.db',
total_lv_size=str(self.total_ssd_size),
total_lvs=vg_extents['parts'],
Expand All @@ -172,16 +148,16 @@ def report_pretty(self):
total_osds=len(self.hdds)
)

string += osd_component_titles
string += templates.osd_component_titles
for osd in self.computed['osds']:
string += osd_header_template
string += osd_component_template.format(
string += templates.osd_header
string += templates.osd_component.format(
_type='[data]',
path=osd['data']['path'],
size=osd['data']['human_readable_size'],
percent=osd['data']['percentage'])

string += osd_component_template.format(
string += templates.osd_component.format(
_type='[block.db]',
path='(volume-group/lv)',
size=osd['block.db']['human_readable_size'],
Expand Down

0 comments on commit 3a7cbab

Please sign in to comment.