diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 04cc6a7685..1dc6430941 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -271,6 +271,12 @@ class openstack_project::template (
     user    => 'root',
   }
 
+  file_line { 'ensure NoRoaming for ssh clients':
+    after => 'Host *',
+    path  => '/etc/ssh/ssh_config',
+    line  => '    UseRoaming no',
+  }
+
   ###########################################################
   # Manage Puppet
   # possible TODO: break this into openstack_project::puppet