From c7cf74f93765e6244c3c2e7f11552b94bb963b58 Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Thu, 24 Jan 2013 10:46:41 +0100 Subject: [PATCH] Deprecate is_admin feature. - This has been confusing since the beginning of keystoneauth. - Do not remove the feature but just print a large warning when used. Change-Id: I13990d7ab6760bb6479cf4f0717067522e1ef920 --- swift/common/middleware/keystoneauth.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/swift/common/middleware/keystoneauth.py b/swift/common/middleware/keystoneauth.py index b7cdd347cb..8f55f24a83 100644 --- a/swift/common/middleware/keystoneauth.py +++ b/swift/common/middleware/keystoneauth.py @@ -62,13 +62,6 @@ class KeystoneAuth(object): setting which by default includes the admin and the swiftoperator roles. - The option is_admin if set to true will allow the - username that has the same name as the account name to be the owner. - - Example: If we have the account called hellocorp with a user - hellocorp that user will be admin on that account and can give ACL - to all other users for hellocorp. - If you need to have a different reseller_prefix to be able to mix different auth servers you can configure the option reseller_prefix in your keystoneauth entry like this : @@ -213,6 +206,9 @@ class KeystoneAuth(object): # If user is of the same name of the tenant then make owner of it. if self.is_admin and user == tenant_name: + self.logger.warning("the is_admin feature has been deprecated " + "and will be removed in the future " + "update your config file") req.environ['swift_owner'] = True return