openstack/puppet-trove
Code Issues Proposed changes

Add support for oslo_policy/enforce_new_defaults

Browse Source 
Depends-on: https://review.opendev.org/781428
Change-Id: I0e6cfc05eb948cdfbb6433b8b6311292ea96d35e
This commit is contained in:
Takashi Kajinami 2021-03-24 18:23:57 +09:00
parent 77fb34e43e
commit 8591466c66
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/policy.pp
View File

@ -8,6 +8,11 @@
# (Optional) Whether or not to enforce scope when evaluating policies. # (Optional) Whether or not to enforce scope when evaluating policies.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# [*enforce_new_defaults*]
# (Optional) Whether or not to use old deprecated defaults when evaluating
# policies.
# Defaults to $::os_service_default.
#
# [*policies*] # [*policies*]
# (Optional) Set of policies to configure for trove # (Optional) Set of policies to configure for trove
# Example : # Example :
@ -28,9 +33,10 @@
# Defaults to /etc/trove/policy.yaml # Defaults to /etc/trove/policy.yaml
# #
class trove::policy ( class trove::policy (
$enforce_scope = $::os_service_default, $enforce_scope = $::os_service_default,
$policies = {}, $enforce_new_defaults = $::os_service_default,
$policy_path = '/etc/trove/policy.yaml', $policies = {},
$policy_path = '/etc/trove/policy.yaml',
) { ) {
include trove::deps include trove::deps
@ -48,8 +54,9 @@ class trove::policy (
create_resources('openstacklib::policy::base', $policies) create_resources('openstacklib::policy::base', $policies)
oslo::policy { 'trove_config': oslo::policy { 'trove_config':
enforce_scope => $enforce_scope, enforce_scope => $enforce_scope,
policy_file => $policy_path enforce_new_defaults => $enforce_new_defaults,
policy_file => $policy_path
} }
} }

5
releasenotes/notes/policy-enforce_new_defaults-f4a0c36ad87ad096.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``trove::policy::enforce_new_defaults`` parameter has been
added.

12
spec/classes/trove_policy_spec.rb
View File

@ -4,9 +4,10 @@ describe 'trove::policy' do
shared_examples 'trove::policy' do shared_examples 'trove::policy' do
let :params do let :params do
{ {
:enforce_scope => false, :enforce_scope => false,
:policy_path => '/etc/trove/policy.yaml', :enforce_new_defaults => false,
:policies => { :policy_path => '/etc/trove/policy.yaml',
:policies => {
'context_is_admin' => { 'context_is_admin' => {
'key' => 'context_is_admin', 'key' => 'context_is_admin',
'value' => 'foo:bar' 'value' => 'foo:bar'
@ -24,8 +25,9 @@ describe 'trove::policy' do
:file_format => 'yaml', :file_format => 'yaml',
}) })
is_expected.to contain_oslo__policy('trove_config').with( is_expected.to contain_oslo__policy('trove_config').with(
:enforce_scope => false, :enforce_scope => false,
:policy_file => '/etc/trove/policy.yaml', :enforce_new_defaults => false,
:policy_file => '/etc/trove/policy.yaml',
) )
end end
end end