diff --git a/manifests/policy.pp b/manifests/policy.pp index ec4602f0b..72c1d71d3 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 neutron # Example : @@ -28,9 +33,10 @@ # Defaults to /etc/neutron/policy.yaml # class neutron::policy ( - $enforce_scope = $::os_service_default, - $policies = {}, - $policy_path = '/etc/neutron/policy.yaml', + $enforce_scope = $::os_service_default, + $enforce_new_defaults = $::os_service_default, + $policies = {}, + $policy_path = '/etc/neutron/policy.yaml', ) { include neutron::deps @@ -48,8 +54,9 @@ class neutron::policy ( create_resources('openstacklib::policy::base', $policies) oslo::policy { 'neutron_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-1e123af8357e4435.yaml b/releasenotes/notes/policy-enforce_new_defaults-1e123af8357e4435.yaml new file mode 100644 index 000000000..f65bf7916 --- /dev/null +++ b/releasenotes/notes/policy-enforce_new_defaults-1e123af8357e4435.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``neutron::policy::enforce_new_defaults`` parameter has been + added. diff --git a/spec/classes/neutron_policy_spec.rb b/spec/classes/neutron_policy_spec.rb index e30b68e3f..6e6bfca9e 100644 --- a/spec/classes/neutron_policy_spec.rb +++ b/spec/classes/neutron_policy_spec.rb @@ -4,9 +4,10 @@ describe 'neutron::policy' do shared_examples 'neutron::policy' do let :params do { - :enforce_scope => false, - :policy_path => '/etc/neutron/policy.yaml', - :policies => { + :enforce_scope => false, + :enforce_new_defaults => false, + :policy_path => '/etc/neutron/policy.yaml', + :policies => { 'context_is_admin' => { 'key' => 'context_is_admin', 'value' => 'foo:bar' @@ -24,8 +25,9 @@ describe 'neutron::policy' do :file_format => 'yaml', }) is_expected.to contain_oslo__policy('neutron_config').with( - :enforce_scope => false, - :policy_file => '/etc/neutron/policy.yaml', + :enforce_scope => false, + :enforce_new_defaults => false, + :policy_file => '/etc/neutron/policy.yaml', ) end end