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: Idb0125811d7cd4b2e5288282649b9668f5711419 Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
parent
4711761aff
commit
4308645975
|
@ -2,6 +2,7 @@
|
|||
#
|
||||
class tacker::params {
|
||||
include ::openstacklib::defaults
|
||||
$group = 'tacker'
|
||||
|
||||
$client_package_name = 'python-tackerclient'
|
||||
case $::osfamily {
|
||||
|
|
|
@ -29,11 +29,14 @@ class tacker::policy (
|
|||
) {
|
||||
|
||||
include ::tacker::deps
|
||||
include ::tacker::params
|
||||
|
||||
validate_hash($policies)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
file_path => $policy_path,
|
||||
file_user => 'root',
|
||||
file_group => $::tacker::params::group,
|
||||
}
|
||||
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'tacker::policy' do
|
||||
shared_examples_for 'tacker-policies' do
|
||||
|
||||
shared_examples_for 'tacker policies' do
|
||||
let :params do
|
||||
{
|
||||
:policy_path => '/etc/tacker/policy.json',
|
||||
|
@ -16,8 +17,10 @@ describe 'tacker::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 => 'tacker',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('tacker_config').with(
|
||||
:policy_file => '/etc/tacker/policy.json',
|
||||
|
@ -26,14 +29,14 @@ describe 'tacker::policy' do
|
|||
end
|
||||
|
||||
on_supported_os({
|
||||
:supported_os => OSDefaults.get_supported_os
|
||||
:supported_os => OSDefaults.get_supported_os
|
||||
}).each do |os,facts|
|
||||
context "on #{os}" do
|
||||
let (:facts) do
|
||||
facts.merge!(OSDefaults.get_facts())
|
||||
end
|
||||
|
||||
it_behaves_like 'tacker-policies'
|
||||
it_configures 'tacker policies'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue