diff --git a/manifests/params.pp b/manifests/params.pp index 44558647..df852c10 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,6 +4,7 @@ class aodh::params { include ::openstacklib::defaults $client_package_name = 'python-aodhclient' + $group = 'aodh' case $::osfamily { 'RedHat': { diff --git a/manifests/policy.pp b/manifests/policy.pp index 97a7b641..c0871f23 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -29,13 +29,18 @@ class aodh::policy ( ) { include ::aodh::deps + include ::aodh::params validate_hash($policies) Openstacklib::Policy::Base { - file_path => $policy_path, + file_path => $policy_path, + file_user => 'root', + file_group => $::aodh::params::group, } create_resources('openstacklib::policy::base', $policies) + oslo::policy { 'aodh_config': policy_file => $policy_path } + } diff --git a/spec/classes/aodh_policy_spec.rb b/spec/classes/aodh_policy_spec.rb index d68dfbb0..07a8b191 100644 --- a/spec/classes/aodh_policy_spec.rb +++ b/spec/classes/aodh_policy_spec.rb @@ -17,8 +17,10 @@ describe 'aodh::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 => 'aodh', }) is_expected.to contain_oslo__policy('aodh_config').with( :policy_file => '/etc/aodh/policy.json', @@ -37,5 +39,4 @@ describe 'aodh::policy' do it_configures 'aodh policies' end end - end