Add support for API_RESULT_PAGE_SIZE

Change-Id: I712ddbb6f1a30bb0149b33c6e1dd2da9c5c8dfba

manifests/init.pp

@@ -114,8 +114,13 @@
 #    Defaults to undef.
 #
 #  [*api_result_limit*]
-#    (optional) Maximum number of Swift containers/objects to display
-#    on a single page. Defaults to 1000.
+#    (optional) Maximum number of objects (Swift containers/objects or images)
+#    to display on a single page.
+#    Defaults to 1000.
+#
+#  [*api_result_page_size*]
+#    (optional) Maximum number of objects retrieved by a single request.
+#    Defaults to 20.
 #
 #  [*dropdown_max_items*]
 #    (optional) Specify a maximum number of items to display in a dropdown.
@@ -549,6 +554,7 @@ class horizon(
   $secondary_endpoint_type             = undef,
   $available_regions                   = undef,
   $api_result_limit                    = 1000,
+  $api_result_page_size                = 20,
   $dropdown_max_items                  = 30,
   $log_handlers                        = ['file'],
   $log_level                           = 'INFO',

releasenotes/notes/api_result_page_size-9efaaf9a23cd0454.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``horizon::api_result_page_size`` parameter has been added, to
+    support the ``API_RESULT_PAGE_SIZE`` parameter.

spec/classes/horizon_init_spec.rb

@@ -73,6 +73,7 @@ describe 'horizon' do
           "    'enable_quotas': True,",
           "    'enable_security_group': True,",
           'API_RESULT_LIMIT = 1000',
+          'API_RESULT_PAGE_SIZE = 20',
           'DROPDOWN_MAX_ITEMS = 30',
           'TIME_ZONE = "UTC"',
           "            'handlers': ['file'],",
@@ -106,7 +107,8 @@ describe 'horizon' do
           :secondary_endpoint_type        => 'ANY-VALUE',
           :django_debug                   => true,
           :site_branding                  => 'mysite',
-          :api_result_limit               => 4682,
+          :api_result_limit               => 2000,
+          :api_result_page_size           => 40,
           :dropdown_max_items             => 123,
           :compress_offline               => false,
           :hypervisor_options             => {'can_set_mount_point' => false, 'can_set_password' => true },
@@ -192,7 +194,8 @@ describe 'horizon' do
           "    'enable_scheduler_hints': True,",
           'OPENSTACK_ENDPOINT_TYPE = "internalURL"',
           'SECONDARY_ENDPOINT_TYPE = "ANY-VALUE"',
-          'API_RESULT_LIMIT = 4682',
+          'API_RESULT_LIMIT = 2000',
+          'API_RESULT_PAGE_SIZE = 40',
           'DROPDOWN_MAX_ITEMS = 123',
           'TIME_ZONE = "Asia/Shanghai"',
           "AVAILABLE_THEMES = [",

templates/local_settings.py.erb

@@ -612,7 +612,7 @@ SECONDARY_ENDPOINT_TYPE = "<%= @secondary_endpoint_type %>"
 #API_RESULT_LIMIT = 1000
 #API_RESULT_PAGE_SIZE = 20$
 API_RESULT_LIMIT = <%= @api_result_limit %>
-API_RESULT_PAGE_SIZE = 20
+API_RESULT_PAGE_SIZE = <%= @api_result_page_size %>
 
 # The size of chunk in bytes for downloading objects from Swift
 #SWIFT_FILE_TRANSFER_CHUNK_SIZE = 512 * 1024