Merge "Default "discoverable" policies to "@""

1 files changed, 79 insertions, 79 deletions

diff --git a/etc/nova/policy.json b/etc/nova/policy.json
index 2911efd9c0..d6b072d50b 100644
--- a/etc/nova/policy.json
+++ b/etc/nova/policy.json
@@ -271,17 +271,17 @@
     "os_compute_api:servers:stop": "rule:admin_or_owner",
     "os_compute_api:servers:trigger_crash_dump": "rule:admin_or_owner",
     "os_compute_api:servers:migrations:force_complete": "rule:admin_api",
-    "os_compute_api:servers:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-access-ips:discoverable": "rule:admin_or_owner",
+    "os_compute_api:servers:discoverable": "@",
+    "os_compute_api:os-access-ips:discoverable": "@",
     "os_compute_api:os-access-ips": "rule:admin_or_owner",
     "os_compute_api:os-admin-actions": "rule:admin_api",
-    "os_compute_api:os-admin-actions:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-admin-actions:discoverable": "@",
     "os_compute_api:os-admin-actions:reset_network": "rule:admin_api",
     "os_compute_api:os-admin-actions:inject_network_info": "rule:admin_api",
     "os_compute_api:os-admin-actions:reset_state": "rule:admin_api",
     "os_compute_api:os-admin-password": "rule:admin_or_owner",
-    "os_compute_api:os-admin-password:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-aggregates:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-admin-password:discoverable": "@",
+    "os_compute_api:os-aggregates:discoverable": "@",
     "os_compute_api:os-aggregates:index": "rule:admin_api",
     "os_compute_api:os-aggregates:create": "rule:admin_api",
     "os_compute_api:os-aggregates:show": "rule:admin_api",
@@ -291,133 +291,133 @@
     "os_compute_api:os-aggregates:remove_host": "rule:admin_api",
     "os_compute_api:os-aggregates:set_metadata": "rule:admin_api",
     "os_compute_api:os-agents": "rule:admin_api",
-    "os_compute_api:os-agents:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-agents:discoverable": "@",
     "os_compute_api:os-attach-interfaces": "rule:admin_or_owner",
-    "os_compute_api:os-attach-interfaces:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-attach-interfaces:discoverable": "@",
     "os_compute_api:os-baremetal-nodes": "rule:admin_api",
-    "os_compute_api:os-baremetal-nodes:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-block-device-mapping-v1:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-baremetal-nodes:discoverable": "@",
+    "os_compute_api:os-block-device-mapping-v1:discoverable": "@",
     "os_compute_api:os-cells": "rule:admin_api",
     "os_compute_api:os-cells:create": "rule:admin_api",
     "os_compute_api:os-cells:delete": "rule:admin_api",
     "os_compute_api:os-cells:update": "rule:admin_api",
     "os_compute_api:os-cells:sync_instances": "rule:admin_api",
-    "os_compute_api:os-cells:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-cells:discoverable": "@",
     "os_compute_api:os-certificates:create": "rule:admin_or_owner",
     "os_compute_api:os-certificates:show": "rule:admin_or_owner",
-    "os_compute_api:os-certificates:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-certificates:discoverable": "@",
     "os_compute_api:os-cloudpipe": "rule:admin_api",
-    "os_compute_api:os-cloudpipe:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-cloudpipe:discoverable": "@",
     "os_compute_api:os-config-drive": "rule:admin_or_owner",
-    "os_compute_api:os-consoles:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-consoles:discoverable": "@",
     "os_compute_api:os-consoles:create": "rule:admin_or_owner",
     "os_compute_api:os-consoles:delete": "rule:admin_or_owner",
     "os_compute_api:os-consoles:index": "rule:admin_or_owner",
     "os_compute_api:os-consoles:show": "rule:admin_or_owner",
-    "os_compute_api:os-console-output:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-console-output:discoverable": "@",
     "os_compute_api:os-console-output": "rule:admin_or_owner",
     "os_compute_api:os-remote-consoles": "rule:admin_or_owner",
-    "os_compute_api:os-remote-consoles:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-create-backup:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-remote-consoles:discoverable": "@",
+    "os_compute_api:os-create-backup:discoverable": "@",
     "os_compute_api:os-create-backup": "rule:admin_or_owner",
     "os_compute_api:os-deferred-delete": "rule:admin_or_owner",
-    "os_compute_api:os-deferred-delete:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-deferred-delete:discoverable": "@",
     "os_compute_api:os-disk-config": "rule:admin_or_owner",
-    "os_compute_api:os-disk-config:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-disk-config:discoverable": "@",
     "os_compute_api:os-evacuate": "rule:admin_api",
-    "os_compute_api:os-evacuate:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-evacuate:discoverable": "@",
     "os_compute_api:os-extended-server-attributes": "rule:admin_api",
-    "os_compute_api:os-extended-server-attributes:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-extended-server-attributes:discoverable": "@",
     "os_compute_api:os-extended-status": "rule:admin_or_owner",
-    "os_compute_api:os-extended-status:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-extended-status:discoverable": "@",
     "os_compute_api:os-extended-availability-zone": "rule:admin_or_owner",
-    "os_compute_api:os-extended-availability-zone:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-extended-availability-zone:discoverable": "@",
     "os_compute_api:extensions": "rule:admin_or_owner",
-    "os_compute_api:extensions:discoverable": "rule:admin_or_owner",
-    "os_compute_api:extension_info:discoverable": "rule:admin_or_owner",
+    "os_compute_api:extensions:discoverable": "@",
+    "os_compute_api:extension_info:discoverable": "@",
     "os_compute_api:os-extended-volumes": "rule:admin_or_owner",
-    "os_compute_api:os-extended-volumes:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-extended-volumes:discoverable": "@",
     "os_compute_api:os-fixed-ips": "rule:admin_api",
-    "os_compute_api:os-fixed-ips:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-fixed-ips:discoverable": "@",
     "os_compute_api:os-flavor-access": "rule:admin_or_owner",
-    "os_compute_api:os-flavor-access:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-flavor-access:discoverable": "@",
     "os_compute_api:os-flavor-access:remove_tenant_access": "rule:admin_api",
     "os_compute_api:os-flavor-access:add_tenant_access": "rule:admin_api",
     "os_compute_api:os-flavor-rxtx": "rule:admin_or_owner",
-    "os_compute_api:os-flavor-rxtx:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-flavor-rxtx:discoverable": "@",
     "os_compute_api:flavors": "rule:admin_or_owner",
-    "os_compute_api:flavors:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-flavor-extra-specs:discoverable": "rule:admin_or_owner",
+    "os_compute_api:flavors:discoverable": "@",
+    "os_compute_api:os-flavor-extra-specs:discoverable": "@",
     "os_compute_api:os-flavor-extra-specs:index": "rule:admin_or_owner",
     "os_compute_api:os-flavor-extra-specs:show": "rule:admin_or_owner",
     "os_compute_api:os-flavor-extra-specs:create": "rule:admin_api",
     "os_compute_api:os-flavor-extra-specs:update": "rule:admin_api",
     "os_compute_api:os-flavor-extra-specs:delete": "rule:admin_api",
-    "os_compute_api:os-flavor-manage:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-flavor-manage:discoverable": "@",
     "os_compute_api:os-flavor-manage": "rule:admin_api",
     "os_compute_api:os-floating-ip-dns": "rule:admin_or_owner",
-    "os_compute_api:os-floating-ip-dns:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-floating-ip-dns:discoverable": "@",
     "os_compute_api:os-floating-ip-dns:domain:update": "rule:admin_api",
     "os_compute_api:os-floating-ip-dns:domain:delete": "rule:admin_api",
     "os_compute_api:os-floating-ip-pools": "rule:admin_or_owner",
-    "os_compute_api:os-floating-ip-pools:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-floating-ip-pools:discoverable": "@",
     "os_compute_api:os-floating-ips": "rule:admin_or_owner",
-    "os_compute_api:os-floating-ips:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-floating-ips:discoverable": "@",
     "os_compute_api:os-floating-ips-bulk": "rule:admin_api",
-    "os_compute_api:os-floating-ips-bulk:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-floating-ips-bulk:discoverable": "@",
     "os_compute_api:os-fping": "rule:admin_or_owner",
-    "os_compute_api:os-fping:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-fping:discoverable": "@",
     "os_compute_api:os-fping:all_tenants": "rule:admin_api",
     "os_compute_api:os-hide-server-addresses": "is_admin:False",
-    "os_compute_api:os-hide-server-addresses:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-hide-server-addresses:discoverable": "@",
     "os_compute_api:os-hosts": "rule:admin_api",
-    "os_compute_api:os-hosts:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-hosts:discoverable": "@",
     "os_compute_api:os-hypervisors": "rule:admin_api",
-    "os_compute_api:os-hypervisors:discoverable": "rule:admin_or_owner",
-    "os_compute_api:images:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-hypervisors:discoverable": "@",
+    "os_compute_api:images:discoverable": "@",
     "os_compute_api:image-size": "rule:admin_or_owner",
-    "os_compute_api:image-size:discoverable": "rule:admin_or_owner",
+    "os_compute_api:image-size:discoverable": "@",
     "os_compute_api:os-instance-actions": "rule:admin_or_owner",
-    "os_compute_api:os-instance-actions:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-instance-actions:discoverable": "@",
     "os_compute_api:os-instance-actions:events": "rule:admin_api",
     "os_compute_api:os-instance-usage-audit-log": "rule:admin_api",
-    "os_compute_api:os-instance-usage-audit-log:discoverable": "rule:admin_or_owner",
-    "os_compute_api:ips:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-instance-usage-audit-log:discoverable": "@",
+    "os_compute_api:ips:discoverable": "@",
     "os_compute_api:ips:index": "rule:admin_or_owner",
     "os_compute_api:ips:show": "rule:admin_or_owner",
-    "os_compute_api:os-keypairs:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-keypairs:discoverable": "@",
     "os_compute_api:os-keypairs": "rule:admin_or_owner",
     "os_compute_api:os-keypairs:index": "rule:admin_api or user_id:%(user_id)s",
     "os_compute_api:os-keypairs:show": "rule:admin_api or user_id:%(user_id)s",
     "os_compute_api:os-keypairs:create": "rule:admin_api or user_id:%(user_id)s",
     "os_compute_api:os-keypairs:delete": "rule:admin_api or user_id:%(user_id)s",
-    "os_compute_api:limits:discoverable": "rule:admin_or_owner",
+    "os_compute_api:limits:discoverable": "@",
     "os_compute_api:limits": "rule:admin_or_owner",
-    "os_compute_api:os-lock-server:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-lock-server:discoverable": "@",
     "os_compute_api:os-lock-server:lock": "rule:admin_or_owner",
     "os_compute_api:os-lock-server:unlock": "rule:admin_or_owner",
     "os_compute_api:os-lock-server:unlock:unlock_override": "rule:admin_api",
-    "os_compute_api:os-migrate-server:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-migrate-server:discoverable": "@",
     "os_compute_api:os-migrate-server:migrate": "rule:admin_api",
     "os_compute_api:os-migrate-server:migrate_live": "rule:admin_api",
     "os_compute_api:os-multinic": "rule:admin_or_owner",
-    "os_compute_api:os-multinic:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-multinic:discoverable": "@",
     "os_compute_api:os-networks": "rule:admin_api",
     "os_compute_api:os-networks:view": "rule:admin_or_owner",
-    "os_compute_api:os-networks:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-networks:discoverable": "@",
     "os_compute_api:os-networks-associate": "rule:admin_api",
-    "os_compute_api:os-networks-associate:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-pause-server:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-networks-associate:discoverable": "@",
+    "os_compute_api:os-pause-server:discoverable": "@",
     "os_compute_api:os-pause-server:pause": "rule:admin_or_owner",
     "os_compute_api:os-pause-server:unpause": "rule:admin_or_owner",
     "os_compute_api:os-pci:pci_servers": "rule:admin_or_owner",
-    "os_compute_api:os-pci:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-pci:discoverable": "@",
     "os_compute_api:os-pci:index": "rule:admin_api",
     "os_compute_api:os-pci:detail": "rule:admin_api",
     "os_compute_api:os-pci:show": "rule:admin_api",
-    "os_compute_api:os-personality:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-preserve-ephemeral-rebuild:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-quota-sets:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-personality:discoverable": "@",
+    "os_compute_api:os-preserve-ephemeral-rebuild:discoverable": "@",
+    "os_compute_api:os-quota-sets:discoverable": "@",
     "os_compute_api:os-quota-sets:show": "rule:admin_or_owner",
     "os_compute_api:os-quota-sets:defaults": "@",
     "os_compute_api:os-quota-sets:update": "rule:admin_api",
@@ -425,25 +425,25 @@
     "os_compute_api:os-quota-sets:detail": "rule:admin_api",
     "os_compute_api:os-quota-class-sets:update": "rule:admin_api",
     "os_compute_api:os-quota-class-sets:show": "is_admin:True or quota_class:%(quota_class)s",
-    "os_compute_api:os-quota-class-sets:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-quota-class-sets:discoverable": "@",
     "os_compute_api:os-rescue": "rule:admin_or_owner",
-    "os_compute_api:os-rescue:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-scheduler-hints:discoverable": "rule:admin_or_owner",
-    "os_compute_api:os-security-group-default-rules:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-rescue:discoverable": "@",
+    "os_compute_api:os-scheduler-hints:discoverable": "@",
+    "os_compute_api:os-security-group-default-rules:discoverable": "@",
     "os_compute_api:os-security-group-default-rules": "rule:admin_api",
     "os_compute_api:os-security-groups": "rule:admin_or_owner",
-    "os_compute_api:os-security-groups:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-security-groups:discoverable": "@",
     "os_compute_api:os-server-diagnostics": "rule:admin_api",
-    "os_compute_api:os-server-diagnostics:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-server-diagnostics:discoverable": "@",
     "os_compute_api:os-server-password": "rule:admin_or_owner",
-    "os_compute_api:os-server-password:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-server-password:discoverable": "@",
     "os_compute_api:os-server-usage": "rule:admin_or_owner",
-    "os_compute_api:os-server-usage:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-server-usage:discoverable": "@",
     "os_compute_api:os-server-groups": "rule:admin_or_owner",
-    "os_compute_api:os-server-groups:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-server-groups:discoverable": "@",
     "os_compute_api:os-services": "rule:admin_api",
-    "os_compute_api:os-services:discoverable": "rule:admin_or_owner",
-    "os_compute_api:server-metadata:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-services:discoverable": "@",
+    "os_compute_api:server-metadata:discoverable": "@",
     "os_compute_api:server-metadata:index": "rule:admin_or_owner",
     "os_compute_api:server-metadata:show": "rule:admin_or_owner",
     "os_compute_api:server-metadata:delete": "rule:admin_or_owner",
@@ -451,38 +451,38 @@
     "os_compute_api:server-metadata:update": "rule:admin_or_owner",
     "os_compute_api:server-metadata:update_all": "rule:admin_or_owner",
     "os_compute_api:os-shelve:shelve": "rule:admin_or_owner",
-    "os_compute_api:os-shelve:shelve:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-shelve:shelve:discoverable": "@",
     "os_compute_api:os-shelve:shelve_offload": "rule:admin_api",
-    "os_compute_api:os-simple-tenant-usage:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-simple-tenant-usage:discoverable": "@",
     "os_compute_api:os-simple-tenant-usage:show": "rule:admin_or_owner",
     "os_compute_api:os-simple-tenant-usage:list": "rule:admin_api",
-    "os_compute_api:os-suspend-server:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-suspend-server:discoverable": "@",
     "os_compute_api:os-suspend-server:suspend": "rule:admin_or_owner",
     "os_compute_api:os-suspend-server:resume": "rule:admin_or_owner",
     "os_compute_api:os-tenant-networks": "rule:admin_or_owner",
-    "os_compute_api:os-tenant-networks:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-tenant-networks:discoverable": "@",
     "os_compute_api:os-shelve:unshelve": "rule:admin_or_owner",
-    "os_compute_api:os-user-data:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-user-data:discoverable": "@",
     "os_compute_api:os-virtual-interfaces": "rule:admin_or_owner",
-    "os_compute_api:os-virtual-interfaces:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-virtual-interfaces:discoverable": "@",
     "os_compute_api:os-volumes": "rule:admin_or_owner",
-    "os_compute_api:os-volumes:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-volumes:discoverable": "@",
     "os_compute_api:os-volumes-attachments:index": "rule:admin_or_owner",
     "os_compute_api:os-volumes-attachments:show": "rule:admin_or_owner",
     "os_compute_api:os-volumes-attachments:create": "rule:admin_or_owner",
     "os_compute_api:os-volumes-attachments:update": "rule:admin_or_owner",
     "os_compute_api:os-volumes-attachments:delete": "rule:admin_or_owner",
-    "os_compute_api:os-volumes-attachments:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-volumes-attachments:discoverable": "@",
     "os_compute_api:os-availability-zone:list": "rule:admin_or_owner",
-    "os_compute_api:os-availability-zone:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-availability-zone:discoverable": "@",
     "os_compute_api:os-availability-zone:detail": "rule:admin_api",
     "os_compute_api:os-used-limits": "rule:admin_api",
-    "os_compute_api:os-used-limits:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-used-limits:discoverable": "@",
     "os_compute_api:os-migrations:index": "rule:admin_api",
-    "os_compute_api:os-migrations:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-migrations:discoverable": "@",
     "os_compute_api:os-assisted-volume-snapshots:create": "rule:admin_api",
     "os_compute_api:os-assisted-volume-snapshots:delete": "rule:admin_api",
-    "os_compute_api:os-assisted-volume-snapshots:discoverable": "rule:admin_or_owner",
+    "os_compute_api:os-assisted-volume-snapshots:discoverable": "@",
     "os_compute_api:os-console-auth-tokens": "rule:admin_api",
     "os_compute_api:os-server-external-events:create": "rule:admin_api"
 }