openstack/puppet-horizon
Code Issues Proposed changes

Support COMPRESS_ROOT option

Browse Source 
Change-Id: I037f1ecd857981b5dc6b4162007480484c48f681
This commit is contained in:
Takashi Kajinami 2024-08-03 21:17:21 +09:00
parent c8c7d3d72b
commit ddec1b8866
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -183,6 +183,11 @@
# (optional) Boolean to enable offline compress of assets. # (optional) Boolean to enable offline compress of assets.
# Defaults to True # Defaults to True
# #
# [*compress_root*]
# (optional) Absolute file path that linked static will be read from and
# compressed static will be written to
# Defaults to undef
#
# [*hypervisor_options*] # [*hypervisor_options*]
# (optional) A hash of parameters to enable features specific to # (optional) A hash of parameters to enable features specific to
# Hypervisors. # Hypervisors.
@ -606,6 +611,7 @@ class horizon(
$wsgi_threads = '1', $wsgi_threads = '1',
Boolean $compress_enabled = true, Boolean $compress_enabled = true,
Boolean $compress_offline = true, Boolean $compress_offline = true,
Optional[Stdlib::Absolutepath] $compress_root = undef,
# TODO(tkajinam) Consider adding more strict validation about key-value # TODO(tkajinam) Consider adding more strict validation about key-value
Hash $hypervisor_options = {}, Hash $hypervisor_options = {},
Hash $cinder_options = {}, Hash $cinder_options = {},

4
releasenotes/notes/compress_root-0a77ff2912d85a57.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``horizon::compress_root`` parameter has been added.

2
spec/classes/horizon_init_spec.rb
View File

@ -114,6 +114,7 @@ describe 'horizon' do
:dropdown_max_items => 123, :dropdown_max_items => 123,
:compress_enabled => false, :compress_enabled => false,
:compress_offline => false, :compress_offline => false,
:compress_root => '/tmp',
:hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true }, :hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true },
:cinder_options => {'enable_backup' => true }, :cinder_options => {'enable_backup' => true },
:keystone_options => {'name' => 'native', 'can_edit_user' => true, 'can_edit_group' => true, 'can_edit_project' => true, 'can_edit_domain' => false, 'can_edit_role' => false}, :keystone_options => {'name' => 'native', 'can_edit_user' => true, 'can_edit_group' => true, 'can_edit_project' => true, 'can_edit_domain' => false, 'can_edit_role' => false},
@ -223,6 +224,7 @@ describe 'horizon' do
'TOKEN_TIMEOUT_MARGIN = 60', 'TOKEN_TIMEOUT_MARGIN = 60',
'COMPRESS_ENABLED = False', 'COMPRESS_ENABLED = False',
'COMPRESS_OFFLINE = False', 'COMPRESS_OFFLINE = False',
"COMPRESS_ROOT = '/tmp'",
"FILE_UPLOAD_TEMP_DIR = '/var/spool/horizon'", "FILE_UPLOAD_TEMP_DIR = '/var/spool/horizon'",
'OVERVIEW_DAYS_RANGE = 1', 'OVERVIEW_DAYS_RANGE = 1',
'DISALLOW_IFRAME_EMBED = True', 'DISALLOW_IFRAME_EMBED = True',

7
templates/local_settings.py.erb
View File

@ -1066,6 +1066,13 @@ COMPRESS_ENABLED = <%= @compress_enabled.to_s.capitalize %>
# the python-lesscpy package and disable the following option. # the python-lesscpy package and disable the following option.
COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %> COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %>
# Controls the absolute file path that linked static will be read from and
# compressed static will be written to
# COMPRESS_ROOT = STATIC_ROOT
<% if ! @compress_root.nil? -%>
COMPRESS_ROOT = '<%= @compress_root %>'
<% end -%>
# For Glance image upload, Horizon uses the file upload support from Django # For Glance image upload, Horizon uses the file upload support from Django
# so we add this option to change the directory where uploaded files are temporarily # so we add this option to change the directory where uploaded files are temporarily
# stored until they are loaded into Glance. # stored until they are loaded into Glance.