From 39f03063c0b0b22e608bbc606423e51be632be2a Mon Sep 17 00:00:00 2001
From: Vadym Markov <vmarkov@mirantis.com>
Date: Wed, 30 Jun 2021 14:58:06 +0300
Subject: [PATCH] Update policy file to yaml

See the included reno file for details.

Change-Id: I39834214740b2a494105a1130964fba3134d420c
---
 README.rst                                             |  2 +-
 doc/source/index.rst                                   |  2 +-
 masakaridashboard/conf/masakari_policy.json            | 10 ----------
 masakaridashboard/conf/masakari_policy.yaml            |  9 +++++++++
 .../local/local_settings.d/_50_masakari.py             |  2 +-
 .../notes/yamlify-policy-169e72bc8abd93a1.yaml         |  7 +++++++
 6 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 masakaridashboard/conf/masakari_policy.json
 create mode 100644 masakaridashboard/conf/masakari_policy.yaml
 create mode 100644 releasenotes/notes/yamlify-policy-169e72bc8abd93a1.yaml

diff --git a/README.rst b/README.rst
index 66e63fa..3936ba9 100644
--- a/README.rst
+++ b/README.rst
@@ -55,7 +55,7 @@ And enable it in Horizon::
 
     ln -s ../masakari-dashboard/masakaridashboard/local/enabled/_50_masakaridashboard.py openstack_dashboard/local/enabled
     ln -s ../masakari-dashboard/masakaridashboard/local/local_settings.d/_50_masakari.py openstack_dashboard/local/local_settings.d
-    ln -s ../masakari-dashboard/masakaridashboard/conf/masakari_policy.json openstack_dashboard/conf
+    ln -s ../masakari-dashboard/masakaridashboard/conf/masakari_policy.yaml openstack_dashboard/conf
 
 To run horizon with the newly enabled Masakari dashboard plugin run::
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 4ba5405..adf35f3 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -55,7 +55,7 @@ And enable it in Horizon::
 
     ln -s ../masakari-dashboard/masakaridashboard/local/enabled/_50_masakaridashboard.py openstack_dashboard/local/enabled
     ln -s ../masakari-dashboard/masakaridashboard/local/local_settings.d/_50_masakari.py openstack_dashboard/local/local_settings.d
-    ln -s ../masakari-dashboard/masakaridashboard/conf/masakari_policy.json openstack_dashboard/conf
+    ln -s ../masakari-dashboard/masakaridashboard/conf/masakari_policy.yaml openstack_dashboard/conf
 
 To run horizon with the newly enabled Masakari dashboard plugin run::
 
diff --git a/masakaridashboard/conf/masakari_policy.json b/masakaridashboard/conf/masakari_policy.json
deleted file mode 100644
index 31e2083..0000000
--- a/masakaridashboard/conf/masakari_policy.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "admin_api": "is_admin:True",
-    "context_is_admin":  "role:admin",
-    "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
-    "default": "rule:admin_api",
-    "os_masakari_api:extensions": "rule:admin_api",
-    "os_masakari_api:segments": "rule:admin_api",
-    "os_masakari_api:os-hosts": "rule:admin_api",
-    "os_masakari_api:notifications": "rule:admin_api"
-}
diff --git a/masakaridashboard/conf/masakari_policy.yaml b/masakaridashboard/conf/masakari_policy.yaml
new file mode 100644
index 0000000..85c6c4c
--- /dev/null
+++ b/masakaridashboard/conf/masakari_policy.yaml
@@ -0,0 +1,9 @@
+---
+admin_api: is_admin:True
+context_is_admin: role:admin
+admin_or_owner: is_admin:True or project_id:%(project_id)s
+default: rule:admin_api
+os_masakari_api:extensions: rule:admin_api
+os_masakari_api:segments: rule:admin_api
+os_masakari_api:os-hosts: rule:admin_api
+os_masakari_api:notifications: rule:admin_api
diff --git a/masakaridashboard/local/local_settings.d/_50_masakari.py b/masakaridashboard/local/local_settings.d/_50_masakari.py
index 22a43d7..a1c92c2 100644
--- a/masakaridashboard/local/local_settings.d/_50_masakari.py
+++ b/masakaridashboard/local/local_settings.d/_50_masakari.py
@@ -16,4 +16,4 @@
 from openstack_dashboard.settings import POLICY_FILES
 
 
-POLICY_FILES.update({'instance-ha': 'masakari_policy.json'})
+POLICY_FILES.update({'instance-ha': 'masakari_policy.yaml'})
diff --git a/releasenotes/notes/yamlify-policy-169e72bc8abd93a1.yaml b/releasenotes/notes/yamlify-policy-169e72bc8abd93a1.yaml
new file mode 100644
index 0000000..0fb74a1
--- /dev/null
+++ b/releasenotes/notes/yamlify-policy-169e72bc8abd93a1.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Since Victoria, release JSON policy files are obsolete. In Masakari
+    they were deprecated in Wallaby. The old JSON policy file
+    is a valid YAML, but at least changing the file extension is needed.
+    The JSON file is no longer used by default nor distributed.