From 93153e59534e582c1edca69d7e889d756ccf4b0a Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Tue, 21 Sep 2021 21:55:35 +0000 Subject: [PATCH] Fix typos in application credential policies We updated these policies when we introduces system scope and default roles, but the policy names accidentally changed, which makes the policy files render with an alias because oslo.policy thinks the names are changing. Conflicts: keystone/common/policies/application_credential.py in later releases the deprecated parameters were moved from the DocumentedRuleDefault object to the DeprecatedRule object, which is a non-functional change. Change-Id: I1121f1abe769ee83ffc285103a95ee95540ce727 (cherry picked from commit 60e898c47038667e66a54e0a9a6cd7b91e115f55) (cherry picked from commit 7b28f1b3b47d0e4a22afe99c64d047016a772da5) (cherry picked from commit 14d2f5944ce9ef0cc881b91463df7cf3a1114d5b) (cherry picked from commit 4063ad98e7bebc4c56eb92be742cfda7254c27e7) (cherry picked from commit aa9459447f61fd51df20e1cbba8146033696bd01) --- keystone/common/policies/application_credential.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keystone/common/policies/application_credential.py b/keystone/common/policies/application_credential.py index cebb85b026..e44c661b16 100644 --- a/keystone/common/policies/application_credential.py +++ b/keystone/common/policies/application_credential.py @@ -23,11 +23,11 @@ deprecated_list_application_credentials_for_user = policy.DeprecatedRule( check_str=base.RULE_ADMIN_OR_OWNER ) deprecated_get_application_credentials_for_user = policy.DeprecatedRule( - name=base.IDENTITY % 'get_application_credentials', + name=base.IDENTITY % 'get_application_credential', check_str=base.RULE_ADMIN_OR_OWNER ) deprecated_delete_application_credentials_for_user = policy.DeprecatedRule( - name=base.IDENTITY % 'delete_application_credentials', + name=base.IDENTITY % 'delete_application_credential', check_str=base.RULE_ADMIN_OR_OWNER )