From 87f9a81b75947a8cf6866422be483c8763c3bc71 Mon Sep 17 00:00:00 2001 From: Marc Koderer Date: Wed, 22 Feb 2017 16:40:28 +0100 Subject: [PATCH] Align policy.json with code Snapshot policy is named inconsistently. Fixing this in the code would cause a migration conflict since both "share:create_snapshot" and "share_snapshot:create_snapshot" need to be supported. Instead this fixes only policy.json Change-Id: I5869f53ac5086d7411dc3553b4cf88423b7524f5 Closes-bug: #1666498 --- etc/manila/policy.json | 6 +++--- releasenotes/notes/fix_policy_file-4a382ac241c718c6.yaml | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix_policy_file-4a382ac241c718c6.yaml diff --git a/etc/manila/policy.json b/etc/manila/policy.json index 0b98432f25..673d06ff87 100644 --- a/etc/manila/policy.json +++ b/etc/manila/policy.json @@ -53,11 +53,11 @@ "share_instance_export_location:index": "rule:admin_api", "share_instance_export_location:show": "rule:admin_api", - "share_snapshot:create_snapshot": "rule:default", - "share_snapshot:delete_snapshot": "rule:default", + "share:create_snapshot": "rule:default", + "share:delete_snapshot": "rule:default", + "share:snapshot_update": "rule:default", "share_snapshot:get_snapshot": "rule:default", "share_snapshot:get_all_snapshots": "rule:default", - "share_snapshot:snapshot_update": "rule:default", "share_snapshot:manage_snapshot": "rule:admin_api", "share_snapshot:unmanage_snapshot": "rule:admin_api", "share_snapshot:force_delete": "rule:admin_api", diff --git a/releasenotes/notes/fix_policy_file-4a382ac241c718c6.yaml b/releasenotes/notes/fix_policy_file-4a382ac241c718c6.yaml new file mode 100644 index 0000000000..67bb762037 --- /dev/null +++ b/releasenotes/notes/fix_policy_file-4a382ac241c718c6.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Adapted policy.json file to correct snapshot policy values. +