Merge "Do not show diff of local_settings(.py)"
This commit is contained in:
commit
a90402f337
@ -757,11 +757,12 @@ class horizon(
|
|||||||
}
|
}
|
||||||
|
|
||||||
concat { $::horizon::params::config_file:
|
concat { $::horizon::params::config_file:
|
||||||
mode => '0640',
|
mode => '0640',
|
||||||
owner => $::horizon::params::wsgi_user,
|
owner => $::horizon::params::wsgi_user,
|
||||||
group => $::horizon::params::wsgi_group,
|
group => $::horizon::params::wsgi_group,
|
||||||
require => Anchor['horizon::config::begin'],
|
show_diff => false,
|
||||||
tag => ['django-config'],
|
require => Anchor['horizon::config::begin'],
|
||||||
|
tag => ['django-config'],
|
||||||
}
|
}
|
||||||
|
|
||||||
concat::fragment { 'local_settings.py':
|
concat::fragment { 'local_settings.py':
|
||||||
|
@ -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_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]')
|
is_expected.to contain_concat(platforms_params[:config_file]).that_notifies('Exec[refresh_horizon_django_compress]')
|
||||||
end
|
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
|
it 'configures apache' do
|
||||||
@ -792,6 +799,8 @@ describe 'horizon' do
|
|||||||
:root_url => '/horizon',
|
:root_url => '/horizon',
|
||||||
:root_path => '/var/lib/openstack-dashboard',
|
:root_path => '/var/lib/openstack-dashboard',
|
||||||
:memcache_package => 'python3-memcache',
|
:memcache_package => 'python3-memcache',
|
||||||
|
:wsgi_user => 'horizon',
|
||||||
|
:wsgi_group => 'horizon',
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ :config_file => '/etc/openstack-dashboard/local_settings.py',
|
{ :config_file => '/etc/openstack-dashboard/local_settings.py',
|
||||||
@ -800,6 +809,8 @@ describe 'horizon' do
|
|||||||
:root_url => '/horizon',
|
:root_url => '/horizon',
|
||||||
:root_path => '/var/lib/openstack-dashboard',
|
:root_path => '/var/lib/openstack-dashboard',
|
||||||
:memcache_package => 'python3-memcache',
|
:memcache_package => 'python3-memcache',
|
||||||
|
:wsgi_user => 'horizon',
|
||||||
|
:wsgi_group => 'horizon',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
@ -809,6 +820,8 @@ describe 'horizon' do
|
|||||||
:root_url => '/dashboard',
|
:root_url => '/dashboard',
|
||||||
:root_path => '/usr/share/openstack-dashboard',
|
:root_path => '/usr/share/openstack-dashboard',
|
||||||
:memcache_package => 'python3-memcached',
|
:memcache_package => 'python3-memcached',
|
||||||
|
:wsgi_user => 'apache',
|
||||||
|
:wsgi_group => 'apache',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user