From c57f9f9e8065705681a77f294fd8642c3cc5be25 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 16 Mar 2021 18:49:56 +0900
Subject: [PATCH] [novajoin] Use yaml instead of json for policy file

This replaces the remaining usage of policy.json in novajoin with
policy.yaml, because json format will be deprecated[1].

[1] https://governance.openstack.org/tc/goals/selected/wallaby/migrate-policy-format-from-json-to-yaml.html

Depends-on: https://review.opendev.org/769647
Change-Id: I6272d37c4c5a927236660c96522590face337715
---
 manifests/metadata/novajoin/policy.pp              | 11 ++++++-----
 spec/classes/nova_metadata_novajoin_policy_spec.rb | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifests/metadata/novajoin/policy.pp b/manifests/metadata/novajoin/policy.pp
index eb7053519..4ff11707e 100644
--- a/manifests/metadata/novajoin/policy.pp
+++ b/manifests/metadata/novajoin/policy.pp
@@ -16,19 +16,20 @@
 #   Defaults to empty hash.
 #
 # [*policy_path*]
-#   (Optional) Path to the novajoin policy.json file
-#   Defaults to /etc/novajoin/policy.json
+#   (Optional) Path to the novajoin policy.yaml file
+#   Defaults to /etc/novajoin/policy.yaml
 #
 class nova::metadata::novajoin::policy (
   $policies    = {},
-  $policy_path = '/etc/novajoin/policy.json',
+  $policy_path = '/etc/novajoin/policy.yaml',
 ) {
 
   validate_legacy(Hash, 'validate_hash', $policies)
 
   $policy_defaults = {
-    file_path  => $policy_path,
-    file_user  => 'root',
+    file_path   => $policy_path,
+    file_user   => 'root',
+    file_format => 'yaml',
   }
 
   create_resources('openstacklib::policy::base', $policies, $policy_defaults)
diff --git a/spec/classes/nova_metadata_novajoin_policy_spec.rb b/spec/classes/nova_metadata_novajoin_policy_spec.rb
index 0dbc15cb8..1a6c913e4 100644
--- a/spec/classes/nova_metadata_novajoin_policy_spec.rb
+++ b/spec/classes/nova_metadata_novajoin_policy_spec.rb
@@ -5,7 +5,7 @@ describe 'nova::metadata::novajoin::policy' do
   shared_examples_for 'novajoin policies' do
     let :params do
       {
-        :policy_path => '/etc/novajoin/policy.json',
+        :policy_path => '/etc/novajoin/policy.yaml',
         :policies    => {
           'context_is_admin' => {
             'key'   => 'context_is_admin',
@@ -17,12 +17,13 @@ describe 'nova::metadata::novajoin::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',
+        :key         => 'context_is_admin',
+        :value       => 'foo:bar',
+        :file_user   => 'root',
+        :file_format => 'yaml',
       })
       is_expected.to contain_oslo__policy('novajoin_config').with(
-        :policy_file => '/etc/novajoin/policy.json',
+        :policy_file => '/etc/novajoin/policy.yaml',
       )
     end
   end