diff --git a/etc/cinder/rootwrap.conf b/etc/cinder/rootwrap.conf
index bf41bbd14ea..3180e12be85 100644
--- a/etc/cinder/rootwrap.conf
+++ b/etc/cinder/rootwrap.conf
@@ -25,3 +25,9 @@ syslog_log_facility=syslog
 # INFO means log all usage
 # ERROR means only log unsuccessful attempts
 syslog_log_level=ERROR
+
+# Rootwrap daemon exits after this seconds of inactivity
+daemon_timeout=600
+
+# Rootwrap daemon limits itself to that many file descriptors (Linux only)
+rlimit_nofile=1024