diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index c04701f77..9f72b44d2 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -53,6 +53,7 @@ cephx: true
 cephx_require_signatures: true # Kernel RBD does NOT support signatures!
 cephx_cluster_require_signatures: true
 cephx_service_require_signatures: false
+max_open_files: 131072
 disable_in_memory_logs: true
 
 ## Monitor options
diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 75132fe4d..6f5097b7a 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -15,6 +15,7 @@
   auth supported = none
 {% endif %}
   fsid = {{ fsid }}
+  max open files = {{ max_open_files }}
   osd pool default pg num = {{ pool_default_pg_num }}
   osd pool default pgp num = {{ pool_default_pgp_num }}
   osd pool default size = {{ pool_default_size }}