openstack
/
charm-ceph-osd
Code Issues Proposed changes

charms.ceph sync for py3 bug fix 

Change-Id: Id0add7b995e424a5a1c77c80e242fc6ffca54c87
Partial-Bug: #1735720
This commit is contained in:
Liam Young 2017-12-01 13:35:27 +00:00
parent 1efade7f7c
commit f5c1861054
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/ceph/utils.py
View File

@ -944,15 +944,27 @@ def get_partition_list(dev):
# For each line of output # For each line of output
for partition in partitions: for partition in partitions:
parts = partition.split() parts = partition.split()
partitions_list.append( try:
Partition(number=parts[0], partitions_list.append(
start=parts[1], Partition(number=parts[0],
end=parts[2], start=parts[1],
sectors=parts[3], end=parts[2],
size=parts[4], sectors=parts[3],
name=parts[5], size=parts[4],
uuid=parts[6]) name=parts[5],
) uuid=parts[6])
)
except IndexError:
partitions_list.append(
Partition(number=parts[0],
start=parts[1],
end=parts[2],
sectors=parts[3],
size=parts[4],
name="",
uuid=parts[5])
)
return partitions_list return partitions_list
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise raise
@ -2159,7 +2171,7 @@ UCA_CODENAME_MAP = {
def pretty_print_upgrade_paths(): def pretty_print_upgrade_paths():
"""Pretty print supported upgrade paths for ceph""" """Pretty print supported upgrade paths for ceph"""
return ["{} -> {}".format(key, value) return ["{} -> {}".format(key, value)
for key, value in UPGRADE_PATHS.iteritems()] for key, value in UPGRADE_PATHS.items()]
def resolve_ceph_version(source): def resolve_ceph_version(source):