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: Ic5f73993ea4d71fc186272c624a906fcae2dcfa8
Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
Emilien Macchi 2018-01-10 14:09:35 -08:00
parent 73210b5516
commit dabc9d9d1f
3 changed files with 11 additions and 6 deletions

View File

@ -4,7 +4,7 @@
#
class magnum::params {
include ::openstacklib::defaults
$group = 'magnum'
case $::osfamily {
'RedHat': {
# package names

View File

@ -29,15 +29,18 @@ class magnum::policy (
) {
include ::magnum::deps
include ::magnum::params
validate_hash($policies)
Openstacklib::Policy::Base {
file_path => $policy_path,
file_path => $policy_path,
file_user => 'root',
file_group => $::magnum::params::group,
}
create_resources('openstacklib::policy::base', $policies)
oslo::policy { 'magnum_config': policy_file => $policy_path}
oslo::policy { 'magnum_config': policy_file => $policy_path }
}

View File

@ -17,8 +17,10 @@ describe 'magnum::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 => 'magnum',
})
is_expected.to contain_oslo__policy('magnum_config').with(
:policy_file => '/etc/magnum/policy.json',
@ -34,7 +36,7 @@ describe 'magnum::policy' do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'magnum policies'
it_configures 'magnum policies'
end
end
end