summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisashi Osanai <osanai.hisashi@jp.fujitsu.com>2015-03-23 11:29:16 +0900
committerHisashi Osanai <osanai.hisashi@jp.fujitsu.com>2015-03-25 14:56:45 +0900
commit75e84543aab5af8038e0e1a369fcf0ed10ea2509 (patch)
tree440556482fbec33bc5a8e24a61bf974984ea2a46
parent1bafdd9f532e3006a02b992a764a2efb337a5f61 (diff)
downloadswift-75e84543aab5af8038e0e1a369fcf0ed10ea2509.tar.gz
Clarify the description of backward compatibility in Keystoneauth's docstring
If no prefix implies for the operator_roles and/or service_roles parameters applies to all reseller_prefixes in the code. But from backward comatibility point of view, the service_roles parameter is newly introduced parameter so it is better to clarify the docstring. Change-Id: I8b0d5aeff785c21b8a8b0f5b20f774fad868016d
-rw-r--r--swift/common/middleware/keystoneauth.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/swift/common/middleware/keystoneauth.py b/swift/common/middleware/keystoneauth.py
index 09d559664..505024e69 100644
--- a/swift/common/middleware/keystoneauth.py
+++ b/swift/common/middleware/keystoneauth.py
@@ -106,9 +106,9 @@ class KeystoneAuth(object):
operator_roles
service_roles
- For backward compatibility, no prefix implies the parameter
- applies to all reseller_prefixes. Here is an example, using two
- prefixes::
+ For backward compatibility, if either of these parameters is specified
+ without a prefix then it applies to all reseller_prefixes. Here is an
+ example, using two prefixes::
reseller_prefix = AUTH, SERVICE
# The next three lines have identical effects (since the first applies