Merge "Add support for OPENSTACK_USE_SIMPLE_TENANT_USAGE"

manifests/init.pp

@@ -215,6 +215,10 @@
 #        by the nova scheduler.
 #        Defaults to 'Any'
 #
+#  [*use_simple_tenant_usage*]
+#    (optional) Use SimpleTenantUsage nova API in the usage overview.
+#    (Defaults to undef)
+#
 #  [*configure_apache*]
 #    (optional) Configure Apache for Horizon. (Defaults to true)
 #
@@ -583,6 +587,7 @@ class horizon(
   $keystone_options                    = {},
   $neutron_options                     = {},
   $instance_options                    = {},
+  $use_simple_tenant_usage             = undef,
   $file_upload_temp_dir                = '/tmp',
   $policy_files_path                   = undef,
   $policy_files                        = undef,

releasenotes/notes/use_simple_tenant_usage-f53e475bf7a5252f.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The new ``horizon::use_simple_tenant_usage`` parameter has been added.
+    This parameter controls value of the ``OPENSTACK_USE_SIMPLE_TENANT_USAGE``
+    parameter.

templates/local_settings.py.erb

@@ -438,6 +438,15 @@ OPENSTACK_ENABLE_PASSWORD_RETRIEVE = True
 #LAUNCH_INSTANCE_LEGACY_ENABLED = False
 #LAUNCH_INSTANCE_NG_ENABLED = True
 
+# This setting controls whether SimpleTenantUsage nova API is used in the usage
+# overview. According to feedbacks to the horizon team, the usage of
+# SimpleTenantUsage can cause performance issues in the nova API in larger
+# deployments. Try to set this to ``False`` for such cases.
+#OPENSTACK_USE_SIMPLE_TENANT_USAGE = True
+<% if ! (@use_simple_tenant_usage.nil?) -%>
+OPENSTACK_USE_SIMPLE_TENANT_USAGE = <%= @use_simple_tenant_usage.to_s.capitalize %>
+<% end -%>
+
 # The Xen Hypervisor has the ability to set the mount point for volumes
 # attached to instances (other Hypervisors currently do not). Setting
 # can_set_mount_point to True will add the option to set the mount point