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: I4dfcf05aa8418df3ee1a13925f0831dc30921186 Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
parent
9acf1ffcdc
commit
23b8e80456
|
@ -8,6 +8,7 @@ class keystone::params {
|
|||
$keystone_group = 'keystone'
|
||||
$keystone_wsgi_admin_script_path = '/usr/bin/keystone-wsgi-admin'
|
||||
$keystone_wsgi_public_script_path = '/usr/bin/keystone-wsgi-public'
|
||||
$group = 'keystone'
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
$package_name = 'keystone'
|
||||
|
|
|
@ -29,13 +29,18 @@ class keystone::policy (
|
|||
) {
|
||||
|
||||
include ::keystone::deps
|
||||
include ::keystone::params
|
||||
|
||||
validate_hash($policies)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
file_path => $policy_path,
|
||||
file_user => 'root',
|
||||
file_group => $::keystone::params::group,
|
||||
}
|
||||
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
||||
oslo::policy { 'keystone_config': policy_file => $policy_path }
|
||||
|
||||
}
|
||||
|
|
|
@ -17,8 +17,10 @@ describe 'keystone::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 => 'keystone',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('keystone_config').with(
|
||||
:policy_file => '/etc/keystone/policy.json',
|
||||
|
@ -37,5 +39,4 @@ describe 'keystone::policy' do
|
|||
it_configures 'keystone policies'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue