openstack
/
puppet-horizon
Code Issues Proposed changes

Merge "Do not show diff of local_settings(.py)"

This commit is contained in:
Zuul 2022-08-19 19:24:15 +00:00 committed by Gerrit Code Review
parent d73e23c4bc a810ca2b4e
commit a90402f337
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -757,11 +757,12 @@ class horizon(
}
concat { $::horizon::params::config_file:
mode => '0640',
owner => $::horizon::params::wsgi_user,
group => $::horizon::params::wsgi_group,
require => Anchor['horizon::config::begin'],
tag => ['django-config'],
mode => '0640',
owner => $::horizon::params::wsgi_user,
group => $::horizon::params::wsgi_group,
show_diff => false,
require => Anchor['horizon::config::begin'],
tag => ['django-config'],
}
concat::fragment { 'local_settings.py':

13
spec/classes/horizon_init_spec.rb
View File

@ -39,6 +39,13 @@ describe 'horizon' do
is_expected.to_not contain_concat(platforms_params[:config_file]).that_notifies('Exec[refresh_horizon_django_cache]')
is_expected.to contain_concat(platforms_params[:config_file]).that_notifies('Exec[refresh_horizon_django_compress]')
end
is_expected.to contain_concat(platforms_params[:config_file]).with(
:mode => '0640',
:owner => platforms_params[:wsgi_user],
:group => platforms_params[:wsgi_group],
:show_diff => false
)
}
it 'configures apache' do
@ -792,6 +799,8 @@ describe 'horizon' do
:root_url => '/horizon',
:root_path => '/var/lib/openstack-dashboard',
:memcache_package => 'python3-memcache',
:wsgi_user => 'horizon',
:wsgi_group => 'horizon',
}
else
{ :config_file => '/etc/openstack-dashboard/local_settings.py',
@ -800,6 +809,8 @@ describe 'horizon' do
:root_url => '/horizon',
:root_path => '/var/lib/openstack-dashboard',
:memcache_package => 'python3-memcache',
:wsgi_user => 'horizon',
:wsgi_group => 'horizon',
}
end
when 'RedHat'
@ -809,6 +820,8 @@ describe 'horizon' do
:root_url => '/dashboard',
:root_path => '/usr/share/openstack-dashboard',
:memcache_package => 'python3-memcached',
:wsgi_user => 'apache',
:wsgi_group => 'apache',
}
end
end