From 80aba73d39e8a9d4e752f374d35411481b390104 Mon Sep 17 00:00:00 2001
From: somayeh_hajiahmadi <somaye.hmd@gmail.com>
Date: Tue, 12 Sep 2023 18:25:33 +0330
Subject: [PATCH] use policy.yaml instead of policy.json due to latest change
 on gnocchi

Change-Id: If05936d25db3329b4204172f3b800ddf3417b9b7
---
 handlers/main.yml              |  4 ++--
 tasks/gnocchi_post_install.yml | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 19c1e24..8867dea 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -43,8 +43,8 @@
 #
 - name: Copy new policy file into place
   copy:
-    src: "/etc/gnocchi/policy.json-{{ gnocchi_venv_tag }}"
-    dest: "/etc/gnocchi/policy.json"
+    src: "/etc/gnocchi/policy.yaml-{{ gnocchi_venv_tag }}"
+    dest: "/etc/gnocchi/policy.yaml"
     owner: "root"
     group: "{{ gnocchi_system_group_name }}"
     mode: "0640"
diff --git a/tasks/gnocchi_post_install.yml b/tasks/gnocchi_post_install.yml
index 99e582e..a85c136 100644
--- a/tasks/gnocchi_post_install.yml
+++ b/tasks/gnocchi_post_install.yml
@@ -41,10 +41,20 @@
       config_overrides: "{{ gnocchi_api_paste_ini_overrides }}"
       config_type: "ini"
       content: "{{ gnocchi_api_paste_user_content | default(gnocchi_api_paste_default_content, true) }}"
-    - dest: "/etc/gnocchi/policy.json-{{ gnocchi_venv_tag }}"
+    - dest: "/etc/gnocchi/policy.yaml-{{ gnocchi_venv_tag }}"
       config_overrides: "{{ gnocchi_policy_overrides }}"
-      config_type: "json"
+      config_type: "yaml"
       content: "{{ gnocchi_policy_user_content | default(gnocchi_policy_default_content, true) }}"
   notify:
     - Restart gnocchi services
     - Restart uwsgi services
+    
+- name: Remove legacy policy.yaml file
+  file:
+    path: "/etc/gnocchi/policy.yaml"
+    state: absent
+  when:
+    - gnocchi_policy_overrides | length == 0
+  tags:
+    - gnocchi-policy-override
+