From 3fd71f5a933052b0a3fd4dadb3a754ac544348f3 Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Thu, 26 Aug 2021 16:29:51 +0000 Subject: Fix typo in identity provider policies This cause the sample generated policy file to alias the old name with the new policy name, which isn't needed since we're not renaming these policies at all and it was likely a typo. Conflicts: keystone/common/policies/identity_provider.py In later releases the deprecation parameters were moved up to the deprecated options and not in the DocumentedRule defaults. Change-Id: Idfd9adbbe800bbc21814d94002a2b61524cce28a (cherry picked from commit c10d5c88ef40e63d4dfefb792d6c3d68acd72dd9) (cherry picked from commit bdd8f82f60d2e46e5f6951c4407366b89591cde5) (cherry picked from commit f742fadef1718e070ff4e151d400a96dc6acf74e) --- keystone/common/policies/identity_provider.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keystone/common/policies/identity_provider.py b/keystone/common/policies/identity_provider.py index 2236d2aea..8d6ad46d2 100644 --- a/keystone/common/policies/identity_provider.py +++ b/keystone/common/policies/identity_provider.py @@ -16,7 +16,7 @@ from oslo_policy import policy from keystone.common.policies import base deprecated_get_idp = policy.DeprecatedRule( - name=base.IDENTITY % 'get_identity_providers', + name=base.IDENTITY % 'get_identity_provider', check_str=base.RULE_ADMIN_REQUIRED ) deprecated_list_idp = policy.DeprecatedRule( @@ -24,15 +24,15 @@ deprecated_list_idp = policy.DeprecatedRule( check_str=base.RULE_ADMIN_REQUIRED ) deprecated_update_idp = policy.DeprecatedRule( - name=base.IDENTITY % 'update_identity_providers', + name=base.IDENTITY % 'update_identity_provider', check_str=base.RULE_ADMIN_REQUIRED ) deprecated_create_idp = policy.DeprecatedRule( - name=base.IDENTITY % 'create_identity_providers', + name=base.IDENTITY % 'create_identity_provider', check_str=base.RULE_ADMIN_REQUIRED ) deprecated_delete_idp = policy.DeprecatedRule( - name=base.IDENTITY % 'delete_identity_providers', + name=base.IDENTITY % 'delete_identity_provider', check_str=base.RULE_ADMIN_REQUIRED ) -- cgit v1.2.1