openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Use yaml instead of json for policy file"

This commit is contained in:
Zuul 2021-01-14 21:56:42 +00:00 committed by Gerrit Code Review
parent 9a1acfc99b 18b21aea40
commit 0c3fcfbd0b
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/policy.pp
View File

@ -20,12 +20,12 @@
# Defaults to empty hash. # Defaults to empty hash.
# #
# [*policy_path*] # [*policy_path*]
# (Optional) Path to the glance policy.json file # (Optional) Path to the glance policy.yaml file
# Defaults to /etc/glance/policy.json # Defaults to /etc/glance/policy.yaml
# #
class glance::policy ( class glance::policy (
$policies = {}, $policies = {},
$policy_path = '/etc/glance/policy.json', $policy_path = '/etc/glance/policy.yaml',
) { ) {
include glance::deps include glance::deps
@ -34,11 +34,12 @@ class glance::policy (
validate_legacy(Hash, 'validate_hash', $policies) validate_legacy(Hash, 'validate_hash', $policies)
Openstacklib::Policy::Base { Openstacklib::Policy::Base {
file_path => $policy_path, file_path => $policy_path,
file_user => 'root', file_user => 'root',
file_group => $::glance::params::group, file_group => $::glance::params::group,
require => Anchor['glance::config::begin'], file_format => 'yaml',
notify => Anchor['glance::config::end'], require => Anchor['glance::config::begin'],
notify => Anchor['glance::config::end'],
} }
create_resources('openstacklib::policy::base', $policies) create_resources('openstacklib::policy::base', $policies)

4
releasenotes/notes/migrate-policy-format-from-json-to-yaml-06ba9c13ea4cc8f1.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Now policy.yaml is used by default instead of policy.json.

13
spec/classes/glance_policy_spec.rb
View File

@ -5,7 +5,7 @@ describe 'glance::policy' do
shared_examples_for 'glance policies' do shared_examples_for 'glance policies' do
let :params do let :params do
{ {
:policy_path => '/etc/glance/policy.json', :policy_path => '/etc/glance/policy.yaml',
:policies => { :policies => {
'context_is_admin' => { 'context_is_admin' => {
'key' => 'context_is_admin', 'key' => 'context_is_admin',
@ -17,13 +17,14 @@ describe 'glance::policy' do
it 'set up the policies' do it 'set up the policies' do
is_expected.to contain_openstacklib__policy__base('context_is_admin').with({ is_expected.to contain_openstacklib__policy__base('context_is_admin').with({
:key => 'context_is_admin', :key => 'context_is_admin',
:value => 'foo:bar', :value => 'foo:bar',
:file_user => 'root', :file_user => 'root',
:file_group => 'glance', :file_group => 'glance',
:file_format => 'yaml',
}) })
is_expected.to contain_oslo__policy('glance_api_config').with( is_expected.to contain_oslo__policy('glance_api_config').with(
:policy_file => '/etc/glance/policy.json', :policy_file => '/etc/glance/policy.yaml',
) )
end end
end end