From 58ccef2a9c2cd053a2191fca69a6b5db6c542456 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 16 Mar 2021 18:46:26 +0900 Subject: [PATCH] Add support for the oslo_policy/enforce_scope parameter Depends-on: https://review.opendev.org/#/c/759008/ Change-Id: Ibdebe7a447dedbcf16ab9a27a0cc7ac38df4f4c4 --- manifests/policy.pp | 15 ++++++++++++--- ...slo_policy-enforce_scope-0ab6bbda754c0b76.yaml | 5 +++++ spec/classes/zaqar_policy_spec.rb | 15 ++++++++------- 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/oslo_policy-enforce_scope-0ab6bbda754c0b76.yaml diff --git a/manifests/policy.pp b/manifests/policy.pp index 1f86e06..e42a496 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -4,6 +4,10 @@ # # === Parameters # +# [*enforce_scope*] +# (Optional) Whether or not to enforce scope when evaluating policies. +# Defaults to $::os_service_default. +# # [*policies*] # (Optional) Set of policies to configure for zaqar # Example : @@ -24,8 +28,9 @@ # Defaults to /etc/zaqar/policy.yaml # class zaqar::policy ( - $policies = {}, - $policy_path = '/etc/zaqar/policy.yaml', + $enforce_scope = $::os_service_default, + $policies = {}, + $policy_path = '/etc/zaqar/policy.yaml', ) { include zaqar::deps @@ -42,5 +47,9 @@ class zaqar::policy ( create_resources('openstacklib::policy::base', $policies) - oslo::policy { 'zaqar_config': policy_file => $policy_path } + oslo::policy { 'zaqar_config': + enforce_scope => $enforce_scope, + policy_file => $policy_path + } + } diff --git a/releasenotes/notes/oslo_policy-enforce_scope-0ab6bbda754c0b76.yaml b/releasenotes/notes/oslo_policy-enforce_scope-0ab6bbda754c0b76.yaml new file mode 100644 index 0000000..a42ff1f --- /dev/null +++ b/releasenotes/notes/oslo_policy-enforce_scope-0ab6bbda754c0b76.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``zaqar::policy::enforce_scope`` parameter has been added to + support the corresponding parameter in oslo.policy library. diff --git a/spec/classes/zaqar_policy_spec.rb b/spec/classes/zaqar_policy_spec.rb index 634ce5e..330d0f1 100644 --- a/spec/classes/zaqar_policy_spec.rb +++ b/spec/classes/zaqar_policy_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' describe 'zaqar::policy' do - - shared_examples_for 'zaqar policies' do + shared_examples 'zaqar::policy' do let :params do { - :policy_path => '/etc/zaqar/policy.yaml', - :policies => { + :enforce_scope => false, + :policy_path => '/etc/zaqar/policy.yaml', + :policies => { 'context_is_admin' => { 'key' => 'context_is_admin', 'value' => 'foo:bar' @@ -24,20 +24,21 @@ describe 'zaqar::policy' do :file_format => 'yaml', }) is_expected.to contain_oslo__policy('zaqar_config').with( - :policy_file => '/etc/zaqar/policy.yaml', + :enforce_scope => false, + :policy_file => '/etc/zaqar/policy.yaml', ) end 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_configures 'zaqar policies' + it_behaves_like 'zaqar::policy' end end end