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: I063979fc2944667f200c8bd774b5252241faf5f6 Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
parent
c408df9393
commit
bab31c0ba2
@ -7,6 +7,7 @@ class octavia::params {
|
||||
$worker_service_name = 'octavia-worker'
|
||||
$health_manager_service_name = 'octavia-health-manager'
|
||||
$housekeeping_service_name = 'octavia-housekeeping'
|
||||
$group = 'octavia'
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
$common_package_name = 'openstack-octavia-common'
|
||||
|
@ -29,14 +29,18 @@ class octavia::policy (
|
||||
) {
|
||||
|
||||
include ::octavia::deps
|
||||
include ::octavia::params
|
||||
|
||||
validate_hash($policies)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
file_path => $policy_path,
|
||||
file_user => 'root',
|
||||
file_group => $::octavia::params::group,
|
||||
}
|
||||
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
||||
oslo::policy { 'octavia_config': policy_file => $policy_path }
|
||||
|
||||
}
|
||||
|
@ -17,8 +17,10 @@ describe 'octavia::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 => 'octavia',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('octavia_config').with(
|
||||
:policy_file => '/etc/octavia/policy.json',
|
||||
@ -37,5 +39,4 @@ describe 'octavia::policy' do
|
||||
it_configures 'octavia policies'
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user