openstack
/
charm-ceph-osd
Code Issues Proposed changes

Fix subscription of filter object error 

In Python 3 filter() built-in returns a iterator and not a list

Change-Id: I641565109b0dcc816a66d3ca3eb578fb9ed44a1a
Closes-Bug: #1774694
This commit is contained in:
Frode Nordahl 2018-06-04 18:08:24 +02:00
parent 352d699387
commit 4368f6b545
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/add_disk.py
View File

@ -39,8 +39,7 @@ def add_device(request, device_path, bucket=None):
ceph.utils.tune_dev(dev)
mounts = filter(lambda disk: device_path
in disk.device, psutil.disk_partitions())
if mounts:
osd = mounts[0]
for osd in mounts:
osd_id = osd.mountpoint.split('/')[-1].split('-')[-1]
request.ops.append({
'op': 'move-osd-to-bucket',

7
tests/basic_deployment.py
View File

@ -766,10 +766,9 @@ class CephOsdBasicDeployment(OpenStackAmuletDeployment):
'add-disk', params=add_disk_params)
action_ids.append(action_id)
# NOTE(fnordahl): LP: #1774694
# for unit in range(0, 3):
# assert u.wait_on_action(action_ids[unit]), (
# 'add-disk action failed.')
for unit in range(0, 3):
assert u.wait_on_action(action_ids[unit]), (
'add-disk action failed.')
u.log.debug('Wait for idle/ready status...')
self._auto_wait_for_status(include_only=['ceph-osd'])