Merge "Update paste, policy and rootwrap configurations 2017-04-28"

This commit is contained in:
Jenkins 2017-04-28 12:25:55 +00:00 committed by Gerrit Code Review
commit bc04011168

View File

@ -7,6 +7,7 @@
"admin_owner_or_network_owner": "rule:owner or rule:admin_or_network_owner", "admin_owner_or_network_owner": "rule:owner or rule:admin_or_network_owner",
"admin_only": "rule:context_is_admin", "admin_only": "rule:context_is_admin",
"regular_user": "", "regular_user": "",
"admin_or_data_plane_int": "rule:context_is_admin or role:data_plane_integrator",
"shared": "field:networks:shared=True", "shared": "field:networks:shared=True",
"shared_subnetpools": "field:subnetpools:shared=True", "shared_subnetpools": "field:subnetpools:shared=True",
"shared_address_scopes": "field:address_scopes:shared=True", "shared_address_scopes": "field:address_scopes:shared=True",
@ -93,6 +94,7 @@
"update_port:binding:profile": "rule:admin_only", "update_port:binding:profile": "rule:admin_only",
"update_port:mac_learning_enabled": "rule:context_is_advsvc or rule:admin_or_network_owner", "update_port:mac_learning_enabled": "rule:context_is_advsvc or rule:admin_or_network_owner",
"update_port:allowed_address_pairs": "rule:admin_or_network_owner", "update_port:allowed_address_pairs": "rule:admin_or_network_owner",
"update_port:data_plane_status": "rule:admin_or_data_plane_int",
"delete_port": "rule:context_is_advsvc or rule:admin_owner_or_network_owner", "delete_port": "rule:context_is_advsvc or rule:admin_owner_or_network_owner",
"get_router:ha": "rule:admin_only", "get_router:ha": "rule:admin_only",
@ -102,6 +104,9 @@
"create_router:ha": "rule:admin_only", "create_router:ha": "rule:admin_only",
"get_router": "rule:admin_or_owner", "get_router": "rule:admin_or_owner",
"get_router:distributed": "rule:admin_only", "get_router:distributed": "rule:admin_only",
"update_router": "rule:admin_or_owner",
"update_router:external_gateway_info": "rule:admin_or_owner",
"update_router:external_gateway_info:network_id": "rule:admin_or_owner",
"update_router:external_gateway_info:enable_snat": "rule:admin_only", "update_router:external_gateway_info:enable_snat": "rule:admin_only",
"update_router:distributed": "rule:admin_only", "update_router:distributed": "rule:admin_only",
"update_router:ha": "rule:admin_only", "update_router:ha": "rule:admin_only",
@ -210,5 +215,15 @@
"delete_trunk": "rule:admin_or_owner", "delete_trunk": "rule:admin_or_owner",
"get_subports": "", "get_subports": "",
"add_subports": "rule:admin_or_owner", "add_subports": "rule:admin_or_owner",
"remove_subports": "rule:admin_or_owner" "remove_subports": "rule:admin_or_owner",
"get_security_groups": "rule:admin_or_owner",
"get_security_group": "rule:admin_or_owner",
"create_security_group": "rule:admin_or_owner",
"update_security_group": "rule:admin_or_owner",
"delete_security_group": "rule:admin_or_owner",
"get_security_group_rules": "rule:admin_or_owner",
"get_security_group_rule": "rule:admin_or_owner",
"create_security_group_rule": "rule:admin_or_owner",
"delete_security_group_rule": "rule:admin_or_owner"
} }