Merge pull request #1108 from scality/development/1.1

Forward-port development/1.1 into development/1.2
scality · May 14, 2019 · 6e97701 · 6e97701
2 parents 5963cd2 + 75142df
commit 6e97701
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/roles/prepare_os/tasks/main.yml b/roles/prepare_os/tasks/main.yml
@@ -5,6 +5,7 @@
   with_items:
     - ipvsadm
     - libselinux-python
+    - nfs-utils
   when: ansible_os_family == 'RedHat'
 
 - import_tasks: persistent_logs.yml
diff --git a/roles/setup_lvm_vg/action_plugins/validate_storage.py b/roles/setup_lvm_vg/action_plugins/validate_storage.py
@@ -132,7 +132,7 @@ def is_drive_raw_device(device, ansible_devices):
     if device in ansible_devices:
         return True, ansible_devices[device]
 
-    return False
+    return False, None
 
 
 def get_drive_attributes(device, ansible_devices, unused=False):