openstack/puppet-horizon
Code Issues Proposed changes

Enforce yaml format for policy files

Browse Source 
Support for json format has been removed[1]. Also require boolean
parameter for purge_config.

[1] d689704739abac1711403b3379537e80de212d91

Change-Id: Ib243acde3d31f599efe6cbbc67bc651212d71e98
This commit is contained in:
Takashi Kajinami 2024-09-30 12:32:38 +09:00
parent 7bc0f9abc8
commit 31e1a0f087
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/policy.pp
View File

@ -39,15 +39,15 @@
# #
class horizon::policy( class horizon::policy(
# common parameters # common parameters
$file_mode = '0640', $file_mode = '0640',
$file_format = 'yaml', Enum['yaml'] $file_format = 'yaml',
$purge_config = false, Boolean $purge_config = false,
# service specific parameters # service specific parameters
Hash $cinder_policies = {}, Hash $cinder_policies = {},
Hash $glance_policies = {}, Hash $glance_policies = {},
Hash $keystone_policies = {}, Hash $keystone_policies = {},
Hash $neutron_policies = {}, Hash $neutron_policies = {},
Hash $nova_policies = {}, Hash $nova_policies = {},
) { ) {
include horizon::deps include horizon::deps

12
manifests/policy/base.pp
View File

@ -16,7 +16,7 @@
# Defaults to '0640' # Defaults to '0640'
# #
# [*file_format*] # [*file_format*]
# (Optional) Format for file contents. Valid values # (Optional) Format for file contents. Valid value is 'yaml'
# Defaults to 'yaml'. # Defaults to 'yaml'.
# #
# [*purge_config*] # [*purge_config*]
@ -25,11 +25,11 @@
# Defaults to false. # Defaults to false.
# #
define horizon::policy::base( define horizon::policy::base(
String[1] $policy_file = $name, String[1] $policy_file = $name,
Hash $policies = {}, Hash $policies = {},
$file_mode = '0640', $file_mode = '0640',
$file_format = 'yaml', Enum['yaml'] $file_format = 'yaml',
$purge_config = false, Boolean $purge_config = false,
) { ) {
include horizon::deps include horizon::deps
include horizon::params include horizon::params