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: Id85a83be1845062120adecf7a8ba476f8165f078 Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
parent
7582ee345e
commit
f2f9bbed54
|
@ -5,6 +5,7 @@
|
|||
#
|
||||
class ec2api::params {
|
||||
include ::openstacklib::defaults
|
||||
$group = 'ec2api'
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
$package_name = 'openstack-ec2-api'
|
||||
|
|
|
@ -29,12 +29,14 @@ class ec2api::policy (
|
|||
) {
|
||||
|
||||
include ::ec2api::deps
|
||||
include ::ec2api::params
|
||||
|
||||
validate_hash($policies)
|
||||
validate_absolute_path($policy_path)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
file_path => $policy_path,
|
||||
file_user => 'root',
|
||||
file_group => $::ec2api::params::group,
|
||||
}
|
||||
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
|
|
@ -17,8 +17,10 @@ describe 'ec2api::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 => 'ec2api',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('ec2api_config').with(
|
||||
:policy_file => '/etc/ec2api/policy.json',
|
||||
|
@ -37,5 +39,4 @@ describe 'ec2api::policy' do
|
|||
it_configures 'ec2api policies'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue