diff --git a/actions/add_disk.py b/actions/add_disk.py
index 21ea1ecd..78c7b5e4 100755
--- a/actions/add_disk.py
+++ b/actions/add_disk.py
@@ -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',
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 6e5f880e..5251ada9 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -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'])