Add group to policy management
The move of policy.json into code means the file may not exist. We've added support to ensure that the file exists in the openstacklib but we need to make sure the permissions are right for each service. This adds the group information to the policies so it works right. Depends-On: I26e8b1384f4f69712da9d06a4c565dfd1f17c9ed Change-Id: I223a39c51fbe8e36ed35add00f59af242414ce7a Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
parent
2271915bb9
commit
4708032651
|
@ -14,6 +14,7 @@ class gnocchi::params {
|
|||
$metricd_service_name = 'gnocchi-metricd'
|
||||
$statsd_package_name = 'gnocchi-statsd'
|
||||
$statsd_service_name = 'gnocchi-statsd'
|
||||
$group = 'gnocchi'
|
||||
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
|
|
|
@ -29,11 +29,14 @@ class gnocchi::policy (
|
|||
) {
|
||||
|
||||
include ::gnocchi::deps
|
||||
include ::gnocchi::params
|
||||
|
||||
validate_hash($policies)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
file_path => $policy_path,
|
||||
file_user => 'root',
|
||||
file_group => $::gnocchi::params::group,
|
||||
}
|
||||
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
|
|
@ -17,8 +17,10 @@ describe 'gnocchi::policy' do
|
|||
|
||||
it 'set up the policies' do
|
||||
is_expected.to contain_openstacklib__policy__base('context_is_admin').with({
|
||||
:key => 'context_is_admin',
|
||||
:value => 'foo:bar'
|
||||
:key => 'context_is_admin',
|
||||
:value => 'foo:bar',
|
||||
:file_user => 'root',
|
||||
:file_group => 'gnocchi',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('gnocchi_config').with(
|
||||
:policy_file => '/etc/gnocchi/policy.json',
|
||||
|
@ -34,8 +36,7 @@ describe 'gnocchi::policy' do
|
|||
facts.merge!(OSDefaults.get_facts())
|
||||
end
|
||||
|
||||
it_behaves_like 'gnocchi policies'
|
||||
it_configures 'gnocchi policies'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue