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: I3e6853430363c0976a634ca44d0418948d0ded23
Co-Authored-By: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
Emilien Macchi
2018-01-10 14:12:02 -08:00
parent 287ed90f49
commit ea0947f156
3 changed files with 13 additions and 6 deletions

View File

@@ -2,6 +2,7 @@
#
class watcher::params {
include ::openstacklib::defaults
$group = 'watcher'
case $::osfamily {
'RedHat': {

View File

@@ -29,11 +29,14 @@ class watcher::policy (
) {
include ::watcher::deps
include ::watcher::params
validate_hash($policies)
Openstacklib::Policy::Base {
file_path => $policy_path,
file_path => $policy_path,
file_user => 'root',
file_group => $::watcher::params::group,
}
create_resources('openstacklib::policy::base', $policies)

View File

@@ -1,7 +1,8 @@
require 'spec_helper'
describe 'watcher::policy' do
shared_examples_for 'watcher-policies' do
shared_examples_for 'watcher policies' do
let :params do
{
:policy_path => '/etc/watcher/policy.json',
@@ -16,8 +17,10 @@ describe 'watcher::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 => 'watcher',
})
is_expected.to contain_oslo__policy('watcher_config').with(
:policy_file => '/etc/watcher/policy.json',
@@ -26,14 +29,14 @@ describe 'watcher::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 'watcher-policies'
it_configures 'watcher policies'
end
end
end