diff --git a/modules/openstack_project/files/debian_limits.conf b/modules/openstack_project/files/debian_limits.conf
new file mode 100644
index 0000000000..860c08b8d8
--- /dev/null
+++ b/modules/openstack_project/files/debian_limits.conf
@@ -0,0 +1,4 @@
+# Original 1024
+*                soft   nofile           4096
+# Original 4096
+*                hard   nofile           8192
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 8c201fdee8..2ca7d53965 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -342,6 +342,14 @@ class openstack_project::template (
       }
     }
 
+    file { '/etc/security/limits.d/60-nofile-limit.conf':
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      source  => 'puppet:///modules/openstack_project/debian_limits.conf',
+      replace => true,
+    }
+
     file { '/etc/apt/apt.conf.d/80retry':
       owner   => 'root',
       group   => 'root',