diff --git a/README.rst b/README.rst
index 18bc492..df9d1d1 100644
--- a/README.rst
+++ b/README.rst
@@ -54,6 +54,7 @@
             pool: SAS7K2
         audit: 
           enabled: false
+        osapi_max_limit: 500
 
     cinder:
       volume:
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 4a08a94..1c99e31 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -29,6 +29,7 @@
 #glance_api_insecure=False
 
 osapi_volume_listen={{ controller.osapi.host }}
+osapi_max_limit={{ controller.osapi_max_limit|default('1000') }}
 
 glance_host={{ controller.glance.host }}
 glance_port={{ controller.glance.port }}
diff --git a/cinder/files/mitaka/cinder.conf.controller.Debian b/cinder/files/mitaka/cinder.conf.controller.Debian
index 4ff2811..e57508d 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -27,6 +27,7 @@
 #glance_api_insecure=False
 
 osapi_volume_listen={{ controller.osapi.host }}
+osapi_max_limit={{ controller.osapi_max_limit|default('1000') }}
 
 glance_host={{ controller.glance.host }}
 glance_port={{ controller.glance.port }}