diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py
index 5c4381a02c..99c02ebea3 100644
--- a/manila/share/drivers/generic.py
+++ b/manila/share/drivers/generic.py
@@ -147,10 +147,11 @@ class GenericShareDriver(driver.ExecuteMixin, driver.ShareDriver):
 
     def _ssh_exec(self, server, command):
         connection = self.ssh_connections.get(server['instance_id'])
+        ssh_conn_timeout = self.configuration.ssh_conn_timeout
         if not connection:
             ssh_pool = utils.SSHPool(server['ip'],
                                      22,
-                                     None,
+                                     ssh_conn_timeout,
                                      server['username'],
                                      server.get('password'),
                                      server.get('pk_path'),
diff --git a/manila/tests/share/drivers/test_generic.py b/manila/tests/share/drivers/test_generic.py
index 247fba3cab..ade7d5efbf 100644
--- a/manila/tests/share/drivers/test_generic.py
+++ b/manila/tests/share/drivers/test_generic.py
@@ -1267,6 +1267,8 @@ class GenericShareDriverTestCase(test.TestCase):
                 self._driver.admin_context, server_details)
 
     def test_ssh_exec_connection_not_exist(self):
+        ssh_conn_timeout = 30
+        CONF.set_default('ssh_conn_timeout', ssh_conn_timeout)
         ssh_output = 'fake_ssh_output'
         cmd = ['fake', 'command']
         ssh = mock.Mock()
@@ -1282,7 +1284,7 @@ class GenericShareDriverTestCase(test.TestCase):
         result = self._driver._ssh_exec(self.server, cmd)
 
         utils.SSHPool.assert_called_once_with(
-            self.server['ip'], 22, None, self.server['username'],
+            self.server['ip'], 22, ssh_conn_timeout, self.server['username'],
             self.server['password'], self.server['pk_path'], max_size=1)
         ssh_pool.create.assert_called_once_with()
         processutils.ssh_execute.assert_called_once_with(ssh, 'fake command')