Add support for oslo_policy/enforce_new_defaults

Depends-on: https://review.opendev.org/781428
Change-Id: I2cfa1267b08ea432a8bf3245ebb57abc5fadb809
This commit is contained in:
Takashi Kajinami 2021-04-19 09:31:22 +09:00
parent 14e1b1027b
commit 0e1d398f56
3 changed files with 32 additions and 19 deletions

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 gnocchi # (Optional) Set of policies to configure for gnocchi
# Example : # Example :
@ -24,7 +29,7 @@
# Defaults to empty hash. # Defaults to empty hash.
# #
# [*policy_path*] # [*policy_path*]
# (Optional) Path to the nova policy.yaml file # (Optional) Path to the gnocchi policy.yaml file
# Defaults to /etc/gnocchi/policy.yaml # Defaults to /etc/gnocchi/policy.yaml
# #
# [*policy_dirs*] # [*policy_dirs*]
@ -33,6 +38,7 @@
# #
class gnocchi::policy ( class gnocchi::policy (
$enforce_scope = $::os_service_default, $enforce_scope = $::os_service_default,
$enforce_new_defaults = $::os_service_default,
$policies = {}, $policies = {},
$policy_path = '/etc/gnocchi/policy.yaml', $policy_path = '/etc/gnocchi/policy.yaml',
$policy_dirs = $::os_service_default, $policy_dirs = $::os_service_default,
@ -65,6 +71,7 @@ class gnocchi::policy (
oslo::policy { 'gnocchi_config': oslo::policy { 'gnocchi_config':
enforce_scope => $enforce_scope, enforce_scope => $enforce_scope,
enforce_new_defaults => $enforce_new_defaults,
policy_file => $policy_path, policy_file => $policy_path,
policy_dirs => $policy_dirs, policy_dirs => $policy_dirs,
} }

View File

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

View File

@ -1,11 +1,11 @@
require 'spec_helper' require 'spec_helper'
describe 'gnocchi::policy' do describe 'gnocchi::policy' do
shared_examples 'gnocchi::policy' do
shared_examples_for 'gnocchi::policy' do
let :params do let :params do
{ {
:enforce_scope => false, :enforce_scope => false,
:enforce_new_defaults => false,
:policy_path => '/etc/gnocchi/policy.yaml', :policy_path => '/etc/gnocchi/policy.yaml',
:policy_dirs => '/etc/gnocchi/policy.d', :policy_dirs => '/etc/gnocchi/policy.d',
:policies => { :policies => {
@ -27,6 +27,7 @@ describe 'gnocchi::policy' do
}) })
is_expected.to contain_oslo__policy('gnocchi_config').with( is_expected.to contain_oslo__policy('gnocchi_config').with(
:enforce_scope => false, :enforce_scope => false,
:enforce_new_defaults => false,
:policy_file => '/etc/gnocchi/policy.yaml', :policy_file => '/etc/gnocchi/policy.yaml',
:policy_dirs => '/etc/gnocchi/policy.d', :policy_dirs => '/etc/gnocchi/policy.d',
) )
@ -41,7 +42,7 @@ describe 'gnocchi::policy' do
facts.merge!(OSDefaults.get_facts()) facts.merge!(OSDefaults.get_facts())
end end
it_configures 'gnocchi::policy' it_behaves_like 'gnocchi::policy'
end end
end end
end end