diff --git a/cinder/tests/unit/policy.json b/cinder/tests/unit/policy.json index 05b27d16deb..4337d37d104 100644 --- a/cinder/tests/unit/policy.json +++ b/cinder/tests/unit/policy.json @@ -11,7 +11,6 @@ "volume:delete_volume_metadata": "", "volume:update_volume_metadata": "", "volume:get_volume_admin_metadata": "rule:admin_api", - "volume:delete_volume_admin_metadata": "rule:admin_api", "volume:update_volume_admin_metadata": "rule:admin_api", "volume:delete": "", "volume:update": "", diff --git a/cinder/volume/api.py b/cinder/volume/api.py index 18500e479d9..b4e593042cd 100644 --- a/cinder/volume/api.py +++ b/cinder/volume/api.py @@ -1069,13 +1069,6 @@ class API(base.Base): resource=volume) return dict(rv) - @wrap_check_policy - def delete_volume_admin_metadata(self, context, volume, key): - """Delete the given administration metadata item from a volume.""" - self.db.volume_admin_metadata_delete(context, volume['id'], key) - LOG.info(_LI("Delete volume admin metadata completed successfully."), - resource=volume) - @wrap_check_policy def update_volume_admin_metadata(self, context, volume, metadata, delete=False): diff --git a/etc/cinder/policy.json b/etc/cinder/policy.json index efe3c0488a8..194541a75b7 100644 --- a/etc/cinder/policy.json +++ b/etc/cinder/policy.json @@ -13,7 +13,6 @@ "volume:delete_volume_metadata": "", "volume:update_volume_metadata": "", "volume:get_volume_admin_metadata": "rule:admin_api", - "volume:delete_volume_admin_metadata": "rule:admin_api", "volume:update_volume_admin_metadata": "rule:admin_api", "volume:get_snapshot": "", "volume:get_all_snapshots": "",