charms.ceph sync for py3 bug fix
Change-Id: Id0add7b995e424a5a1c77c80e242fc6ffca54c87 Partial-Bug: #1735720
This commit is contained in:
parent
1efade7f7c
commit
f5c1861054
|
@ -944,6 +944,7 @@ def get_partition_list(dev):
|
|||
# For each line of output
|
||||
for partition in partitions:
|
||||
parts = partition.split()
|
||||
try:
|
||||
partitions_list.append(
|
||||
Partition(number=parts[0],
|
||||
start=parts[1],
|
||||
|
@ -953,6 +954,17 @@ def get_partition_list(dev):
|
|||
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
|
||||
except subprocess.CalledProcessError:
|
||||
raise
|
||||
|
@ -2159,7 +2171,7 @@ UCA_CODENAME_MAP = {
|
|||
def pretty_print_upgrade_paths():
|
||||
"""Pretty print supported upgrade paths for ceph"""
|
||||
return ["{} -> {}".format(key, value)
|
||||
for key, value in UPGRADE_PATHS.iteritems()]
|
||||
for key, value in UPGRADE_PATHS.items()]
|
||||
|
||||
|
||||
def resolve_ceph_version(source):
|
||||
|
|
Loading…
Reference in New Issue