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: I26091326a1b50e977612a2b34a03bf8a938bfb33 Co-Authored-By: Alex Schultz <aschultz@redhat.com>changes/51/532651/1
parent
617ca2ebaf
commit
a36dca7216
|
@ -4,6 +4,7 @@ class aodh::params {
|
|||
include ::openstacklib::defaults
|
||||
|
||||
$client_package_name = 'python-aodhclient'
|
||||
$group = 'aodh'
|
||||
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
|
|
|
@ -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 }
|
||||
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue