Merge "Add support for the oslo_policy/enforce_scope parameter"

This commit is contained in:
Zuul 2021-03-22 09:49:01 +00:00 committed by Gerrit Code Review
commit 252b1b9b0c
3 changed files with 25 additions and 11 deletions

View File

@ -4,6 +4,10 @@
# #
# === Parameters # === Parameters
# #
# [*enforce_scope*]
# (Optional) Whether or not to enforce scope when evaluating policies.
# Defaults to $::os_service_default.
#
# [*policies*] # [*policies*]
# (Optional) Set of policies to configure for barbican # (Optional) Set of policies to configure for barbican
# Example : # Example :
@ -20,12 +24,13 @@
# Defaults to empty hash. # Defaults to empty hash.
# #
# [*policy_path*] # [*policy_path*]
# (Optional) Path to the nova policy.yaml file # (Optional) Path to the barbican policy.yaml file
# Defaults to /etc/barbican/policy.yaml # Defaults to /etc/barbican/policy.yaml
# #
class barbican::policy ( class barbican::policy (
$policies = {}, $enforce_scope = $::os_service_default,
$policy_path = '/etc/barbican/policy.yaml', $policies = {},
$policy_path = '/etc/barbican/policy.yaml',
) { ) {
include barbican::deps include barbican::deps
@ -42,6 +47,9 @@ class barbican::policy (
create_resources('openstacklib::policy::base', $policies) create_resources('openstacklib::policy::base', $policies)
oslo::policy { 'barbican_config': policy_file => $policy_path } oslo::policy { 'barbican_config':
enforce_scope => $enforce_scope,
policy_file => $policy_path
}
} }

View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``barbican::policy::enforce_scope`` parameter has been added to
support the corresponding parameter in oslo.policy library.

View File

@ -1,12 +1,12 @@
require 'spec_helper' require 'spec_helper'
describe 'barbican::policy' do describe 'barbican::policy' do
shared_examples 'barbican::policy' do
shared_examples_for 'barbican policies' do
let :params do let :params do
{ {
:policy_path => '/etc/barbican/policy.yaml', :enforce_scope => false,
:policies => { :policy_path => '/etc/barbican/policy.yaml',
:policies => {
'context_is_admin' => { 'context_is_admin' => {
'key' => 'context_is_admin', 'key' => 'context_is_admin',
'value' => 'foo:bar' 'value' => 'foo:bar'
@ -24,20 +24,21 @@ describe 'barbican::policy' do
:file_format => 'yaml', :file_format => 'yaml',
}) })
is_expected.to contain_oslo__policy('barbican_config').with( is_expected.to contain_oslo__policy('barbican_config').with(
:policy_file => '/etc/barbican/policy.yaml', :enforce_scope => false,
:policy_file => '/etc/barbican/policy.yaml',
) )
end end
end end
on_supported_os({ on_supported_os({
:supported_os => OSDefaults.get_supported_os :supported_os => OSDefaults.get_supported_os
}).each do |os,facts| }).each do |os,facts|
context "on #{os}" do context "on #{os}" do
let (:facts) do let (:facts) do
facts.merge!(OSDefaults.get_facts()) facts.merge!(OSDefaults.get_facts())
end end
it_configures 'barbican policies' it_behaves_like 'barbican::policy'
end end
end end
end end