diff --git a/manifests/init.pp b/manifests/init.pp index a1aec1d7..9b77f58f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -619,7 +619,7 @@ class horizon( Hash $keystone_options = {}, Hash $neutron_options = {}, Hash $instance_options = {}, - $use_simple_tenant_usage = undef, + Boolean $use_simple_tenant_usage = false, Stdlib::Absolutepath $file_upload_temp_dir = '/tmp', Optional[Stdlib::Absolutepath] $policy_files_path = undef, Optional[Hash[String, String]] $policy_files = undef, diff --git a/releasenotes/notes/require-boolean-for-use_simple_tenant_usage-206a3e399976fd9d.yaml b/releasenotes/notes/require-boolean-for-use_simple_tenant_usage-206a3e399976fd9d.yaml new file mode 100644 index 00000000..573c043e --- /dev/null +++ b/releasenotes/notes/require-boolean-for-use_simple_tenant_usage-206a3e399976fd9d.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``horizon::use_simple_tenant_usage`` parameter now requires a boolean + value. diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb index 767e9b1d..099ad445 100644 --- a/templates/local_settings.py.erb +++ b/templates/local_settings.py.erb @@ -429,8 +429,8 @@ OPENSTACK_ENABLE_PASSWORD_RETRIEVE = True # 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 %> +<% if ! @use_simple_tenant_usage -%> +OPENSTACK_USE_SIMPLE_TENANT_USAGE = False <% end -%> # The Xen Hypervisor has the ability to set the mount point for volumes