diff --git a/README.rst b/README.rst
index 3fd1918..c5080b7 100644
--- a/README.rst
+++ b/README.rst
@@ -69,6 +69,7 @@
           password: password
         audit:
           enabled: false
+        osapi_max_limit: 500
 
 
 Nova services from custom package repository
diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index d979217..2c6145a 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -23,6 +23,7 @@
 ram_allocation_ratio = {{ controller.ram_allocation_ratio }}
 disk_allocation_ratio = {{ controller.disk_allocation_ratio }}
 scheduler_default_filters = {{ controller.scheduler_default_filters }}
+osapi_max_limit = {{ controller.osapi_max_limit|default('1000') }}
 
 allow_resize_to_same_host = True
 
diff --git a/nova/files/mitaka/nova-controller.conf.Debian b/nova/files/mitaka/nova-controller.conf.Debian
index 88589fc..b5b0a77 100644
--- a/nova/files/mitaka/nova-controller.conf.Debian
+++ b/nova/files/mitaka/nova-controller.conf.Debian
@@ -22,6 +22,7 @@
 scheduler_default_filters = {{ controller.scheduler_default_filters }}
 scheduler_driver = filter_scheduler
 allow_resize_to_same_host = True
+osapi_max_limit = {{ controller.osapi_max_limit|default('1000') }}
 
 iscsi_helper=tgtadm
 connection_type=libvirt