Merge "Use yaml instead of json for policy file"

manifests/policy.pp

@@ -24,13 +24,13 @@
 #   Defaults to empty hash.
 #
 # [*policy_path*]
-#   (Optional) Path to the nova policy.json file
+#   (Optional) Path to the nova policy.yaml file
-#   Defaults to /etc/keystone/policy.json
+#   Defaults to /etc/keystone/policy.yaml
 #
 class keystone::policy (
   $enforce_scope = $::os_service_default,
   $policies      = {},
-  $policy_path   = '/etc/keystone/policy.json',
+  $policy_path   = '/etc/keystone/policy.yaml',
 ) {
 
   include keystone::deps
@@ -42,6 +42,7 @@ class keystone::policy (
     file_path   => $policy_path,
     file_user   => 'root',
     file_group  => $::keystone::params::group,
+    file_format => 'yaml',
   }
 
   create_resources('openstacklib::policy::base', $policies)

releasenotes/notes/migrate-policy-format-from-json-to-yaml-be47196f7a608760.yaml

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

spec/classes/keystone_policy_spec.rb

@@ -5,7 +5,7 @@ describe 'keystone::policy' do
     let :params do
       {
         :enforce_scope => false,
-        :policy_path   => '/etc/keystone/policy.json',
+        :policy_path   => '/etc/keystone/policy.yaml',
         :policies      => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
@@ -21,10 +21,11 @@ describe 'keystone::policy' do
         :value       => 'foo:bar',
         :file_user   => 'root',
         :file_group  => 'keystone',
+        :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('keystone_config').with(
         :enforce_scope => false,
-        :policy_file   => '/etc/keystone/policy.json',
+        :policy_file   => '/etc/keystone/policy.yaml',
       )
     end
   end