From d994d229998312bd872b6018bcd7a7c2fb114692 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami <tkajinam@redhat.com> Date: Wed, 24 Mar 2021 16:41:21 +0900 Subject: [PATCH] Add support for oslo_policy/enforce_new_defaults Depends-on: https://review.opendev.org/781428 Change-Id: Icaf0f15b0cea8b48561867bdf7c8338a92c4dc03 --- manifests/policy.pp | 17 ++++++++++++----- ...y-enforce_new_defaults-fffb7115927cea4e.yaml | 5 +++++ spec/classes/magnum_policy_spec.rb | 12 +++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/policy-enforce_new_defaults-fffb7115927cea4e.yaml diff --git a/manifests/policy.pp b/manifests/policy.pp index 226803e..681dc9b 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -8,6 +8,11 @@ # (Optional) Whether or not to enforce scope when evaluating policies. # 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*] # (Optional) Set of policies to configure for magnum # Example : @@ -28,9 +33,10 @@ # Defaults to /etc/magnum/policy.yaml # class magnum::policy ( - $enforce_scope = $::os_service_default, - $policies = {}, - $policy_path = '/etc/magnum/policy.yaml', + $enforce_scope = $::os_service_default, + $enforce_new_defaults = $::os_service_default, + $policies = {}, + $policy_path = '/etc/magnum/policy.yaml', ) { include magnum::deps @@ -48,8 +54,9 @@ class magnum::policy ( create_resources('openstacklib::policy::base', $policies) oslo::policy { 'magnum_config': - enforce_scope => $enforce_scope, - policy_file => $policy_path + enforce_scope => $enforce_scope, + enforce_new_defaults => $enforce_new_defaults, + policy_file => $policy_path } } diff --git a/releasenotes/notes/policy-enforce_new_defaults-fffb7115927cea4e.yaml b/releasenotes/notes/policy-enforce_new_defaults-fffb7115927cea4e.yaml new file mode 100644 index 0000000..a637e13 --- /dev/null +++ b/releasenotes/notes/policy-enforce_new_defaults-fffb7115927cea4e.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``magnum::policy::enforce_new_defaults`` parameter has been + added. diff --git a/spec/classes/magnum_policy_spec.rb b/spec/classes/magnum_policy_spec.rb index ec4d3ca..7f6a004 100644 --- a/spec/classes/magnum_policy_spec.rb +++ b/spec/classes/magnum_policy_spec.rb @@ -4,9 +4,10 @@ describe 'magnum::policy' do shared_examples 'magnum::policy' do let :params do { - :enforce_scope => false, - :policy_path => '/etc/magnum/policy.yaml', - :policies => { + :enforce_scope => false, + :enforce_new_defaults => false, + :policy_path => '/etc/magnum/policy.yaml', + :policies => { 'context_is_admin' => { 'key' => 'context_is_admin', 'value' => 'foo:bar' @@ -24,8 +25,9 @@ describe 'magnum::policy' do :file_format => 'yaml', }) is_expected.to contain_oslo__policy('magnum_config').with( - :enforce_scope => false, - :policy_file => '/etc/magnum/policy.yaml', + :enforce_scope => false, + :enforce_new_defaults => false, + :policy_file => '/etc/magnum/policy.yaml', ) end end