diff --git a/manifests/policy.pp b/manifests/policy.pp index 8759a740d..ec4602f0b 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 neutron # Example : @@ -24,8 +28,9 @@ # Defaults to /etc/neutron/policy.yaml # class neutron::policy ( - $policies = {}, - $policy_path = '/etc/neutron/policy.yaml', + $enforce_scope = $::os_service_default, + $policies = {}, + $policy_path = '/etc/neutron/policy.yaml', ) { include neutron::deps @@ -42,6 +47,9 @@ class neutron::policy ( create_resources('openstacklib::policy::base', $policies) - oslo::policy { 'neutron_config': policy_file => $policy_path } + oslo::policy { 'neutron_config': + enforce_scope => $enforce_scope, + policy_file => $policy_path + } } diff --git a/releasenotes/notes/oslo_policy-enforce_scope-a6a75f23548dc29b.yaml b/releasenotes/notes/oslo_policy-enforce_scope-a6a75f23548dc29b.yaml new file mode 100644 index 000000000..9f34687ca --- /dev/null +++ b/releasenotes/notes/oslo_policy-enforce_scope-a6a75f23548dc29b.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``neutron::policy::enforce_scope`` parameter has been added to + support the corresponding parameter in oslo.policy library. diff --git a/spec/classes/neutron_policy_spec.rb b/spec/classes/neutron_policy_spec.rb index 53f97a769..e30b68e3f 100644 --- a/spec/classes/neutron_policy_spec.rb +++ b/spec/classes/neutron_policy_spec.rb @@ -1,11 +1,12 @@ require 'spec_helper' describe 'neutron::policy' do - shared_examples 'neutron policies' do + shared_examples 'neutron::policy' do let :params do { - :policy_path => '/etc/neutron/policy.yaml', - :policies => { + :enforce_scope => false, + :policy_path => '/etc/neutron/policy.yaml', + :policies => { 'context_is_admin' => { 'key' => 'context_is_admin', 'value' => 'foo:bar' @@ -15,28 +16,29 @@ describe 'neutron::policy' do end it 'set up the policies' do - should contain_openstacklib__policy__base('context_is_admin').with({ + is_expected.to contain_openstacklib__policy__base('context_is_admin').with({ :key => 'context_is_admin', :value => 'foo:bar', :file_user => 'root', :file_group => 'neutron', :file_format => 'yaml', }) - should contain_oslo__policy('neutron_config').with( - :policy_file => '/etc/neutron/policy.yaml', + is_expected.to contain_oslo__policy('neutron_config').with( + :enforce_scope => false, + :policy_file => '/etc/neutron/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_behaves_like 'neutron policies' + it_behaves_like 'neutron::policy' end end end