Update Keystone code from repository.

Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00

1 files changed, 163 insertions, 124 deletions

diff --git a/keystone-moon/keystone/locale/keystone.pot b/keystone-moon/keystone/locale/keystone.pot
index 315891aa..64eab4ed 100644
--- a/keystone-moon/keystone/locale/keystone.pot
+++ b/keystone-moon/keystone/locale/keystone.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: keystone 8.0.0.0b3.dev122\n"
+"Project-Id-Version: keystone 9.0.0.dev14\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/keystone\n"
-"POT-Creation-Date: 2015-08-16 06:06+0000\n"
+"POT-Creation-Date: 2015-09-24 06:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -287,95 +287,95 @@ msgid ""
 "%(domain_id)s"
 msgstr ""
 
-#: keystone/exception.py:361
+#: keystone/exception.py:368
 #, python-format
 msgid "Conflict occurred attempting to store %(type)s - %(details)s"
 msgstr ""
 
-#: keystone/exception.py:369
+#: keystone/exception.py:376
 msgid "An unexpected error prevented the server from fulfilling your request."
 msgstr ""
 
-#: keystone/exception.py:372
+#: keystone/exception.py:379
 #, python-format
 msgid ""
 "An unexpected error prevented the server from fulfilling your request: "
 "%(exception)s"
 msgstr ""
 
-#: keystone/exception.py:395
+#: keystone/exception.py:402
 #, python-format
 msgid "Unable to consume trust %(trust_id)s, unable to acquire lock."
 msgstr ""
 
-#: keystone/exception.py:400
+#: keystone/exception.py:407
 msgid ""
 "Expected signing certificates are not available on the server. Please "
 "check Keystone configuration."
 msgstr ""
 
-#: keystone/exception.py:406
+#: keystone/exception.py:413
 #, python-format
 msgid "Malformed endpoint URL (%(endpoint)s), see ERROR log for details."
 msgstr ""
 
-#: keystone/exception.py:411
+#: keystone/exception.py:418
 #, python-format
 msgid ""
 "Group %(group_id)s returned by mapping %(mapping_id)s was not found in "
 "the backend."
 msgstr ""
 
-#: keystone/exception.py:416
+#: keystone/exception.py:423
 #, python-format
 msgid "Error while reading metadata file, %(reason)s"
 msgstr ""
 
-#: keystone/exception.py:420
+#: keystone/exception.py:427
 #, python-format
 msgid ""
 "Unexpected combination of grant attributes - User: %(user_id)s, Group: "
 "%(group_id)s, Project: %(project_id)s, Domain: %(domain_id)s"
 msgstr ""
 
-#: keystone/exception.py:427
+#: keystone/exception.py:434
 msgid "The action you have requested has not been implemented."
 msgstr ""
 
-#: keystone/exception.py:434
+#: keystone/exception.py:441
 msgid "The service you have requested is no longer available on this server."
 msgstr ""
 
-#: keystone/exception.py:441
+#: keystone/exception.py:448
 #, python-format
 msgid "The Keystone configuration file %(config_file)s could not be found."
 msgstr ""
 
-#: keystone/exception.py:446
+#: keystone/exception.py:453
 msgid ""
 "No encryption keys found; run keystone-manage fernet_setup to bootstrap "
 "one."
 msgstr ""
 
-#: keystone/exception.py:451
+#: keystone/exception.py:458
 #, python-format
 msgid ""
 "The Keystone domain-specific configuration has specified more than one "
 "SQL driver (only one is permitted): %(source)s."
 msgstr ""
 
-#: keystone/exception.py:458
+#: keystone/exception.py:465
 #, python-format
 msgid ""
 "%(mod_name)s doesn't provide database migrations. The migration "
 "repository path at %(path)s doesn't exist or isn't a directory."
 msgstr ""
 
-#: keystone/exception.py:465
+#: keystone/exception.py:472
 msgid "Token version is unrecognizable or unsupported."
 msgstr ""
 
-#: keystone/exception.py:470
+#: keystone/exception.py:477
 #, python-format
 msgid ""
 "Unable to sign SAML assertion. It is likely that this server does not "
@@ -383,25 +383,32 @@ msgid ""
 " %(reason)s"
 msgstr ""
 
-#: keystone/exception.py:478
+#: keystone/exception.py:485
 msgid ""
 "No Authorization headers found, cannot proceed with OAuth related calls, "
 "if running under HTTPd or Apache, ensure WSGIPassAuthorization is set to "
 "On."
 msgstr ""
 
-#: keystone/notifications.py:273
+#: keystone/exception.py:493
+#, python-format
+msgid ""
+"Could not determine Identity Provider ID. The configuration option "
+"%(issuer_attribute)s was not found in the request environment."
+msgstr ""
+
+#: keystone/notifications.py:274
 #, python-format
 msgid "%(event)s is not a valid notification event, must be one of: %(actions)s"
 msgstr ""
 
-#: keystone/notifications.py:282
+#: keystone/notifications.py:283
 #, python-format
 msgid "Method not callable: %s"
 msgstr ""
 
 #: keystone/assignment/controllers.py:99 keystone/identity/controllers.py:71
-#: keystone/resource/controllers.py:78
+#: keystone/resource/controllers.py:88
 msgid "Name field is required and cannot be empty"
 msgstr ""
 
@@ -438,21 +445,21 @@ msgid ""
 "an empty list."
 msgstr ""
 
-#: keystone/assignment/core.py:233
+#: keystone/assignment/core.py:198
 msgid "Must specify either domain or project"
 msgstr ""
 
-#: keystone/assignment/core.py:903
+#: keystone/assignment/core.py:873
 #, python-format
 msgid "Project (%s)"
 msgstr ""
 
-#: keystone/assignment/core.py:905
+#: keystone/assignment/core.py:875
 #, python-format
 msgid "Domain (%s)"
 msgstr ""
 
-#: keystone/assignment/core.py:907
+#: keystone/assignment/core.py:877
 msgid "Unknown Target"
 msgstr ""
 
@@ -482,7 +489,7 @@ msgid "Unexpected assignment type encountered, %s"
 msgstr ""
 
 #: keystone/assignment/role_backends/ldap.py:61 keystone/catalog/core.py:135
-#: keystone/common/ldap/core.py:1400 keystone/resource/backends/ldap.py:148
+#: keystone/common/ldap/core.py:1400 keystone/resource/backends/ldap.py:170
 #, python-format
 msgid "Duplicate ID, %s."
 msgstr ""
@@ -505,23 +512,23 @@ msgid ""
 "conflicting values %(new)s and %(old)s"
 msgstr ""
 
-#: keystone/auth/controllers.py:333
+#: keystone/auth/controllers.py:344 keystone/middleware/core.py:227
 msgid "Scoping to both domain and project is not allowed"
 msgstr ""
 
-#: keystone/auth/controllers.py:336
+#: keystone/auth/controllers.py:347
 msgid "Scoping to both domain and trust is not allowed"
 msgstr ""
 
-#: keystone/auth/controllers.py:339
+#: keystone/auth/controllers.py:350
 msgid "Scoping to both project and trust is not allowed"
 msgstr ""
 
-#: keystone/auth/controllers.py:509
+#: keystone/auth/controllers.py:520
 msgid "User not found"
 msgstr ""
 
-#: keystone/auth/controllers.py:613
+#: keystone/auth/controllers.py:624
 msgid "A project-scoped token is required to produce a service catalog."
 msgstr ""
 
@@ -640,7 +647,7 @@ msgstr ""
 msgid "Error while parsing line: '%(line)s': %(err)s"
 msgstr ""
 
-#: keystone/common/authorization.py:47 keystone/common/wsgi.py:66
+#: keystone/common/authorization.py:57 keystone/common/wsgi.py:66
 #, python-format
 msgid "token reference must be a KeystoneToken type, got: %s"
 msgstr ""
@@ -688,27 +695,27 @@ msgstr ""
 msgid "%(property_name)s is not a %(display_expected_type)s"
 msgstr ""
 
-#: keystone/common/controller.py:229 keystone/common/controller.py:245
-#: keystone/token/providers/common.py:636
+#: keystone/common/controller.py:230 keystone/common/controller.py:246
+#: keystone/token/providers/common.py:638
 msgid "Non-default domain is not supported"
 msgstr ""
 
-#: keystone/common/controller.py:322 keystone/common/controller.py:350
-#: keystone/identity/core.py:506 keystone/resource/core.py:774
-#: keystone/resource/backends/ldap.py:61
+#: keystone/common/controller.py:329 keystone/common/controller.py:358
+#: keystone/identity/core.py:596 keystone/resource/core.py:788
+#: keystone/resource/backends/ldap.py:66 keystone/resource/backends/ldap.py:74
 #, python-format
 msgid "Expected dict or list: %s"
 msgstr ""
 
-#: keystone/common/controller.py:363
+#: keystone/common/controller.py:371
 msgid "Marker could not be found"
 msgstr ""
 
-#: keystone/common/controller.py:374
+#: keystone/common/controller.py:382
 msgid "Invalid limit value"
 msgstr ""
 
-#: keystone/common/controller.py:682
+#: keystone/common/controller.py:690
 msgid "Cannot change Domain ID"
 msgstr ""
 
@@ -722,21 +729,35 @@ msgstr ""
 msgid "Unexpected status requested for JSON Home response, %s"
 msgstr ""
 
+#: keystone/common/tokenless_auth.py:74
+msgid "Neither Project Domain ID nor Project Domain Name was provided."
+msgstr ""
+
+#: keystone/common/tokenless_auth.py:166
+msgid ""
+"User auth cannot be built due to missing either user id, or user name "
+"with domain id, or user name with domain name."
+msgstr ""
+
 #: keystone/common/utils.py:166 keystone/credential/controllers.py:44
 msgid "Invalid blob in credential"
 msgstr ""
 
-#: keystone/common/wsgi.py:335
+#: keystone/common/wsgi.py:206
+msgid "Query string is not UTF-8 encoded"
+msgstr ""
+
+#: keystone/common/wsgi.py:343
 #, python-format
 msgid "%s field is required and cannot be empty"
 msgstr ""
 
-#: keystone/common/wsgi.py:347
+#: keystone/common/wsgi.py:355
 #, python-format
 msgid "%s field(s) cannot be empty"
 msgstr ""
 
-#: keystone/common/wsgi.py:558
+#: keystone/common/wsgi.py:566
 msgid "The resource could not be found."
 msgstr ""
 
@@ -882,18 +903,18 @@ msgstr ""
 msgid "LDAP %s delete"
 msgstr ""
 
-#: keystone/common/ldap/core.py:1521
+#: keystone/common/ldap/core.py:1522
 msgid ""
 "Disabling an entity where the 'enable' attribute is ignored by "
 "configuration."
 msgstr ""
 
-#: keystone/common/ldap/core.py:1532
+#: keystone/common/ldap/core.py:1533
 #, python-format
 msgid "Cannot change %(option_name)s %(attr)s"
 msgstr ""
 
-#: keystone/common/ldap/core.py:1619
+#: keystone/common/ldap/core.py:1620
 #, python-format
 msgid "Member %(member)s is already a member of group %(group)s"
 msgstr ""
@@ -919,7 +940,7 @@ msgstr ""
 msgid "%s extension does not exist."
 msgstr ""
 
-#: keystone/common/validation/__init__.py:41
+#: keystone/common/validation/__init__.py:45
 #, python-format
 msgid ""
 "validated expected to find %(param_name)r in function signature for "
@@ -939,12 +960,12 @@ msgstr ""
 msgid "Credential belongs to another user"
 msgstr ""
 
-#: keystone/contrib/endpoint_filter/backends/sql.py:69
+#: keystone/contrib/endpoint_filter/backends/sql.py:70
 #, python-format
 msgid "Endpoint %(endpoint_id)s not found in project %(project_id)s"
 msgstr ""
 
-#: keystone/contrib/endpoint_filter/backends/sql.py:180
+#: keystone/contrib/endpoint_filter/backends/sql.py:181
 msgid "Endpoint Group Project Association not found"
 msgstr ""
 
@@ -961,61 +982,61 @@ msgstr ""
 msgid "Missing entity ID from environment"
 msgstr ""
 
-#: keystone/contrib/federation/controllers.py:344
+#: keystone/contrib/federation/controllers.py:353
 msgid "Use a project scoped token when attempting to create a SAML assertion"
 msgstr ""
 
-#: keystone/contrib/federation/idp.py:476
+#: keystone/contrib/federation/idp.py:477
 #, python-format
 msgid "Cannot open certificate %(cert_file)s. Reason: %(reason)s"
 msgstr ""
 
-#: keystone/contrib/federation/idp.py:543
+#: keystone/contrib/federation/idp.py:544
 msgid "Ensure configuration option idp_entity_id is set."
 msgstr ""
 
-#: keystone/contrib/federation/idp.py:546
+#: keystone/contrib/federation/idp.py:547
 msgid "Ensure configuration option idp_sso_endpoint is set."
 msgstr ""
 
-#: keystone/contrib/federation/idp.py:566
+#: keystone/contrib/federation/idp.py:567
 msgid ""
 "idp_contact_type must be one of: [technical, other, support, "
 "administrative or billing."
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:178
+#: keystone/contrib/federation/utils.py:177
 msgid "Federation token is expired"
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:231
+#: keystone/contrib/federation/utils.py:230
 msgid "Could not find Identity Provider identifier in environment"
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:235
+#: keystone/contrib/federation/utils.py:234
 msgid ""
 "Incoming identity provider identifier not included among the accepted "
 "identifiers."
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:523
+#: keystone/contrib/federation/utils.py:522
 #, python-format
 msgid "User type %s not supported"
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:559
+#: keystone/contrib/federation/utils.py:557
 #, python-format
 msgid ""
 "Invalid rule: %(identity_value)s. Both 'groups' and 'domain' keywords "
 "must be specified."
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:775
+#: keystone/contrib/federation/utils.py:766
 #, python-format
 msgid "Identity Provider %(idp)s is disabled"
 msgstr ""
 
-#: keystone/contrib/federation/utils.py:783
+#: keystone/contrib/federation/utils.py:774
 #, python-format
 msgid "Service Provider %(sp)s is disabled"
 msgstr ""
@@ -1102,8 +1123,8 @@ msgid ""
 msgstr ""
 
 #: keystone/contrib/revoke/core.py:227 keystone/token/provider.py:197
-#: keystone/token/provider.py:220 keystone/token/provider.py:286
-#: keystone/token/provider.py:293
+#: keystone/token/provider.py:221 keystone/token/provider.py:287
+#: keystone/token/provider.py:294
 msgid "Failed to validate token"
 msgstr ""
 
@@ -1120,31 +1141,37 @@ msgstr ""
 msgid "Enabled field should be a boolean"
 msgstr ""
 
-#: keystone/identity/core.py:112
+#: keystone/identity/core.py:127
 #, python-format
 msgid "Database at /domains/%s/config"
 msgstr ""
 
-#: keystone/identity/core.py:189
+#: keystone/identity/core.py:271
+#, python-format
+msgid "Config API entity at /domains/%s/config"
+msgstr ""
+
+#: keystone/identity/core.py:277
 #, python-format
 msgid ""
-"Domain specific sql drivers are not supported via the Identity API. One "
-"is specified in /domains/%s/config"
+"Exceeded attempts to register domain %(domain)s to use the SQL driver, "
+"the last  domain that appears to have had it is %(last_domain)s, giving "
+"up"
 msgstr ""
 
-#: keystone/identity/core.py:361 keystone/identity/backends/ldap.py:58
+#: keystone/identity/core.py:451 keystone/identity/backends/ldap.py:58
 #: keystone/identity/backends/ldap.py:60 keystone/identity/backends/ldap.py:66
 #: keystone/identity/backends/ldap.py:68 keystone/identity/backends/sql.py:104
 #: keystone/identity/backends/sql.py:106
 msgid "Invalid user / password"
 msgstr ""
 
-#: keystone/identity/core.py:771
+#: keystone/identity/core.py:861
 #, python-format
 msgid "User is disabled: %s"
 msgstr ""
 
-#: keystone/identity/core.py:813
+#: keystone/identity/core.py:903
 msgid "Cannot change user ID"
 msgstr ""
 
@@ -1167,19 +1194,23 @@ msgstr ""
 msgid "Found invalid token: scoped to both project and domain."
 msgstr ""
 
-#: keystone/resource/controllers.py:234
+#: keystone/resource/controllers.py:218
+msgid "The creation of projects acting as domains is not allowed yet."
+msgstr ""
+
+#: keystone/resource/controllers.py:252
 msgid ""
 "Cannot use parents_as_list and parents_as_ids query params at the same "
 "time."
 msgstr ""
 
-#: keystone/resource/controllers.py:240
+#: keystone/resource/controllers.py:258
 msgid ""
 "Cannot use subtree_as_list and subtree_as_ids query params at the same "
 "time."
 msgstr ""
 
-#: keystone/resource/core.py:82
+#: keystone/resource/core.py:81
 #, python-format
 msgid "max hierarchy depth reached for %s branch."
 msgstr ""
@@ -1198,137 +1229,145 @@ msgstr ""
 msgid "Domain is disabled: %s"
 msgstr ""
 
-#: keystone/resource/core.py:145
+#: keystone/resource/core.py:143
 #, python-format
 msgid "Domain cannot be named %s"
 msgstr ""
 
-#: keystone/resource/core.py:148
+#: keystone/resource/core.py:146
 #, python-format
 msgid "Domain cannot have ID %s"
 msgstr ""
 
-#: keystone/resource/core.py:160
+#: keystone/resource/core.py:158
 #, python-format
 msgid "Project is disabled: %s"
 msgstr ""
 
-#: keystone/resource/core.py:180
+#: keystone/resource/core.py:178
 #, python-format
 msgid "cannot enable project %s since it has disabled parents"
 msgstr ""
 
-#: keystone/resource/core.py:188
+#: keystone/resource/core.py:186
 #, python-format
 msgid "cannot disable project %s since its subtree contains enabled projects"
 msgstr ""
 
-#: keystone/resource/core.py:199
+#: keystone/resource/core.py:197
 msgid "Update of `parent_id` is not allowed."
 msgstr ""
 
-#: keystone/resource/core.py:226
+#: keystone/resource/core.py:202
+msgid "Update of `is_domain` is not allowed."
+msgstr ""
+
+#: keystone/resource/core.py:229
 #, python-format
 msgid "cannot delete the project %s since it is not a leaf in the hierarchy."
 msgstr ""
 
-#: keystone/resource/core.py:253
+#: keystone/resource/core.py:256
 msgid "Project field is required and cannot be empty."
 msgstr ""
 
-#: keystone/resource/core.py:389
+#: keystone/resource/core.py:392
 msgid "Multiple domains are not supported"
 msgstr ""
 
-#: keystone/resource/core.py:442
+#: keystone/resource/core.py:445
 msgid "delete the default domain"
 msgstr ""
 
-#: keystone/resource/core.py:453
+#: keystone/resource/core.py:456
 msgid "cannot delete a domain that is enabled, please disable it first."
 msgstr ""
 
-#: keystone/resource/core.py:859
+#: keystone/resource/core.py:876
 msgid "No options specified"
 msgstr ""
 
-#: keystone/resource/core.py:865
+#: keystone/resource/core.py:882
 #, python-format
 msgid ""
 "The value of group %(group)s specified in the config should be a "
 "dictionary of options"
 msgstr ""
 
-#: keystone/resource/core.py:889
+#: keystone/resource/core.py:906
 #, python-format
 msgid ""
 "Option %(option)s found with no group specified while checking domain "
 "configuration request"
 msgstr ""
 
-#: keystone/resource/core.py:896
+#: keystone/resource/core.py:913
 #, python-format
 msgid "Group %(group)s is not supported for domain specific configurations"
 msgstr ""
 
-#: keystone/resource/core.py:903
+#: keystone/resource/core.py:920
 #, python-format
 msgid ""
 "Option %(option)s in group %(group)s is not supported for domain specific"
 " configurations"
 msgstr ""
 
-#: keystone/resource/core.py:956
+#: keystone/resource/core.py:973
 msgid "An unexpected error occurred when retrieving domain configs"
 msgstr ""
 
-#: keystone/resource/core.py:1035 keystone/resource/core.py:1119
-#: keystone/resource/core.py:1190 keystone/resource/config_backends/sql.py:70
+#: keystone/resource/core.py:1052 keystone/resource/core.py:1136
+#: keystone/resource/core.py:1207 keystone/resource/config_backends/sql.py:76
 #, python-format
 msgid "option %(option)s in group %(group)s"
 msgstr ""
 
-#: keystone/resource/core.py:1038 keystone/resource/core.py:1124
-#: keystone/resource/core.py:1186
+#: keystone/resource/core.py:1055 keystone/resource/core.py:1141
+#: keystone/resource/core.py:1203
 #, python-format
 msgid "group %(group)s"
 msgstr ""
 
-#: keystone/resource/core.py:1040
+#: keystone/resource/core.py:1057
 msgid "any options"
 msgstr ""
 
-#: keystone/resource/core.py:1084
+#: keystone/resource/core.py:1101
 #, python-format
 msgid ""
 "Trying to update option %(option)s in group %(group)s, so that, and only "
 "that, option must be specified  in the config"
 msgstr ""
 
-#: keystone/resource/core.py:1089
+#: keystone/resource/core.py:1106
 #, python-format
 msgid ""
 "Trying to update group %(group)s, so that, and only that, group must be "
 "specified in the config"
 msgstr ""
 
-#: keystone/resource/core.py:1098
+#: keystone/resource/core.py:1115
 #, python-format
 msgid ""
 "request to update group %(group)s, but config provided contains group "
 "%(group_other)s instead"
 msgstr ""
 
-#: keystone/resource/core.py:1105
+#: keystone/resource/core.py:1122
 #, python-format
 msgid ""
 "Trying to update option %(option)s in group %(group)s, but config "
 "provided contains option %(option_other)s instead"
 msgstr ""
 
-#: keystone/resource/backends/ldap.py:150
-#: keystone/resource/backends/ldap.py:158
-#: keystone/resource/backends/ldap.py:162
+#: keystone/resource/backends/ldap.py:88
+msgid "LDAP does not support projects with is_domain flag enabled"
+msgstr ""
+
+#: keystone/resource/backends/ldap.py:172
+#: keystone/resource/backends/ldap.py:180
+#: keystone/resource/backends/ldap.py:184
 msgid "Domains are read-only against LDAP"
 msgstr ""
 
@@ -1363,62 +1402,62 @@ msgstr ""
 msgid "Unknown token version %s"
 msgstr ""
 
-#: keystone/token/providers/common.py:54
+#: keystone/token/providers/common.py:53
 msgid "Domains are not supported by the v2 API. Please use the v3 API instead."
 msgstr ""
 
-#: keystone/token/providers/common.py:64
+#: keystone/token/providers/common.py:63
 #, python-format
 msgid ""
 "Project not found in the default domain (please use the v3 API instead): "
 "%s"
 msgstr ""
 
-#: keystone/token/providers/common.py:83
+#: keystone/token/providers/common.py:82
 #, python-format
 msgid "User not found in the default domain (please use the v3 API instead): %s"
 msgstr ""
 
-#: keystone/token/providers/common.py:292
-#: keystone/token/providers/common.py:397
+#: keystone/token/providers/common.py:299
+#: keystone/token/providers/common.py:404
 #, python-format
 msgid "User %(user_id)s has no access to project %(project_id)s"
 msgstr ""
 
-#: keystone/token/providers/common.py:297
-#: keystone/token/providers/common.py:402
+#: keystone/token/providers/common.py:304
+#: keystone/token/providers/common.py:409
 #, python-format
 msgid "User %(user_id)s has no access to domain %(domain_id)s"
 msgstr ""
 
-#: keystone/token/providers/common.py:324
+#: keystone/token/providers/common.py:331
 msgid "Trustor is disabled."
 msgstr ""
 
-#: keystone/token/providers/common.py:388
+#: keystone/token/providers/common.py:395
 msgid "Trustee has no delegated roles."
 msgstr ""
 
-#: keystone/token/providers/common.py:449
+#: keystone/token/providers/common.py:456
 #, python-format
 msgid "Invalid audit info data type: %(data)s (%(type)s)"
 msgstr ""
 
-#: keystone/token/providers/common.py:477
+#: keystone/token/providers/common.py:484
 msgid "User is not a trustee."
 msgstr ""
 
-#: keystone/token/providers/common.py:546
+#: keystone/token/providers/common.py:553
 msgid "The configured token provider does not support bind authentication."
 msgstr ""
 
-#: keystone/token/providers/common.py:626
+#: keystone/token/providers/common.py:628
 msgid ""
 "Attempting to use OS-FEDERATION token with V2 Identity Service, use V3 "
 "Authentication"
 msgstr ""
 
-#: keystone/token/providers/common.py:644
+#: keystone/token/providers/common.py:646
 msgid "Domain scoped token is not supported"
 msgstr ""
 
@@ -1426,30 +1465,30 @@ msgstr ""
 msgid "Unable to sign token."
 msgstr ""
 
-#: keystone/token/providers/fernet/core.py:182
+#: keystone/token/providers/fernet/core.py:215
 msgid ""
 "This is not a v2.0 Fernet token. Use v3 for trust, domain, or federated "
 "tokens."
 msgstr ""
 
-#: keystone/token/providers/fernet/token_formatters.py:80
+#: keystone/token/providers/fernet/token_formatters.py:83
 msgid "This is not a recognized Fernet token"
 msgstr ""
 
-#: keystone/token/providers/fernet/token_formatters.py:202
+#: keystone/token/providers/fernet/token_formatters.py:246
 #, python-format
 msgid "This is not a recognized Fernet payload version: %s"
 msgstr ""
 
-#: keystone/trust/controllers.py:144
+#: keystone/trust/controllers.py:141
 msgid "Redelegation allowed for delegated by trust only"
 msgstr ""
 
-#: keystone/trust/controllers.py:177
+#: keystone/trust/controllers.py:174
 msgid "The authenticated user should match the trustor."
 msgstr ""
 
-#: keystone/trust/controllers.py:182
+#: keystone/trust/controllers.py:179
 msgid "At least one role should be specified."
 msgstr ""