Add support for oslo_policy/enforce_new_defaults
Depends-on: https://review.opendev.org/781428 Change-Id: I2cfa1267b08ea432a8bf3245ebb57abc5fadb809
This commit is contained in:
parent
14e1b1027b
commit
0e1d398f56
@ -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 gnocchi
|
||||
# Example :
|
||||
@ -24,7 +29,7 @@
|
||||
# Defaults to empty hash.
|
||||
#
|
||||
# [*policy_path*]
|
||||
# (Optional) Path to the nova policy.yaml file
|
||||
# (Optional) Path to the gnocchi policy.yaml file
|
||||
# Defaults to /etc/gnocchi/policy.yaml
|
||||
#
|
||||
# [*policy_dirs*]
|
||||
@ -32,10 +37,11 @@
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
class gnocchi::policy (
|
||||
$enforce_scope = $::os_service_default,
|
||||
$policies = {},
|
||||
$policy_path = '/etc/gnocchi/policy.yaml',
|
||||
$policy_dirs = $::os_service_default,
|
||||
$enforce_scope = $::os_service_default,
|
||||
$enforce_new_defaults = $::os_service_default,
|
||||
$policies = {},
|
||||
$policy_path = '/etc/gnocchi/policy.yaml',
|
||||
$policy_dirs = $::os_service_default,
|
||||
) {
|
||||
|
||||
include gnocchi::deps
|
||||
@ -64,9 +70,10 @@ class gnocchi::policy (
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
|
||||
oslo::policy { 'gnocchi_config':
|
||||
enforce_scope => $enforce_scope,
|
||||
policy_file => $policy_path,
|
||||
policy_dirs => $policy_dirs,
|
||||
enforce_scope => $enforce_scope,
|
||||
enforce_new_defaults => $enforce_new_defaults,
|
||||
policy_file => $policy_path,
|
||||
policy_dirs => $policy_dirs,
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``gnocchi::policy::enforce_new_defaults`` parameter has been
|
||||
added.
|
@ -1,14 +1,14 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'gnocchi::policy' do
|
||||
|
||||
shared_examples_for 'gnocchi::policy' do
|
||||
shared_examples 'gnocchi::policy' do
|
||||
let :params do
|
||||
{
|
||||
:enforce_scope => false,
|
||||
:policy_path => '/etc/gnocchi/policy.yaml',
|
||||
:policy_dirs => '/etc/gnocchi/policy.d',
|
||||
:policies => {
|
||||
:enforce_scope => false,
|
||||
:enforce_new_defaults => false,
|
||||
:policy_path => '/etc/gnocchi/policy.yaml',
|
||||
:policy_dirs => '/etc/gnocchi/policy.d',
|
||||
:policies => {
|
||||
'context_is_admin' => {
|
||||
'key' => 'context_is_admin',
|
||||
'value' => 'foo:bar'
|
||||
@ -26,22 +26,23 @@ describe 'gnocchi::policy' do
|
||||
:file_format => 'yaml',
|
||||
})
|
||||
is_expected.to contain_oslo__policy('gnocchi_config').with(
|
||||
:enforce_scope => false,
|
||||
:policy_file => '/etc/gnocchi/policy.yaml',
|
||||
:policy_dirs => '/etc/gnocchi/policy.d',
|
||||
:enforce_scope => false,
|
||||
:enforce_new_defaults => false,
|
||||
:policy_file => '/etc/gnocchi/policy.yaml',
|
||||
:policy_dirs => '/etc/gnocchi/policy.d',
|
||||
)
|
||||
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 'gnocchi::policy'
|
||||
it_behaves_like 'gnocchi::policy'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user