Merge "Fix type error on call to mount device" into stable/stein

Author: Zuul

nova/tests/unit/virt/disk/mount/test_nbd.py

@@ -260,6 +260,8 @@ def fake_returns_true(*args, **kwargs):
         mount.map_dev = fake_returns_true
 
         self.assertFalse(mount.do_mount())
+        mock_mount.assert_called_once_with(
+                None, None, tempdir, None)
 
     @mock.patch('nova.privsep.fs.nbd_connect')
     @mock.patch('nova.privsep.fs.nbd_disconnect')

nova/virt/disk/mount/api.py

@@ -248,7 +248,7 @@ def mnt_dev(self):
         LOG.debug("Mount %(dev)s on %(dir)s",
                   {'dev': self.mapped_device, 'dir': self.mount_dir})
         out, err = nova.privsep.fs.mount(None, self.mapped_device,
-                                         self.mount_dir)
+                                         self.mount_dir, None)
         if err:
             self.error = _('Failed to mount filesystem: %s') % err
             LOG.debug(self.error)