Browse Source

Merge "Use yaml instead of json for policy file"

changes/38/771338/1
Zuul 7 months ago
committed by Gerrit Code Review
parent
commit
0c3fcfbd0b
  1. 17
      manifests/policy.pp
  2. 4
      releasenotes/notes/migrate-policy-format-from-json-to-yaml-06ba9c13ea4cc8f1.yaml
  3. 13
      spec/classes/glance_policy_spec.rb

17
manifests/policy.pp

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

4
releasenotes/notes/migrate-policy-format-from-json-to-yaml-06ba9c13ea4cc8f1.yaml

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

13
spec/classes/glance_policy_spec.rb

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

Loading…
Cancel
Save