summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Abstract out attribute_ignore assigning in LDAP driver"Jenkins2013-08-103-12/+4
|\ \ \ \ \
| * | | | | Abstract out attribute_ignore assigning in LDAP driverElena Ezhova2013-08-063-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used to avoid code duplication in keystone/identity/ backends/ldap.py. All changes are fully covered by test_*option_ name*_attribute_ignore() in test_backend_ldap.py. bp refactor-ldap-driver Change-Id: Ia0fc0b3d4a92416dcd65ddb49b3b0bf9a0777363
* | | | | | Merge "Create default role on demand"Jenkins2013-08-102-3/+29
|\ \ \ \ \ \
| * | | | | | Create default role on demandAdam Young2013-08-062-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a user to a project, if the default role is missing, create it. Bug 1176270 Change-Id: Id972ccf9c132c362a0b85049d248530dc2d56d54
* | | | | | | Merge "Abstract out attribute_mapping filling in LDAP driver."Jenkins2013-08-093-34/+19
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Abstract out attribute_mapping filling in LDAP driver.Elena Ezhova2013-08-053-34/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bp refactor-ldap-driver Change-Id: I4b3bb2900b54f046b05d68f15fb6e35b324ca9f7
* | | | | | | Sync unified logging solution from OsloLance Bragstad2013-08-097-40/+936
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a unified logging strategy from oslo-incubator in an attempt to standardize logging in Keystone similar to other OpenStack projects (Nova, Quantum, etc.). This commit only introduces oslo-incubator/openstack/common/log.py and it's dependencies. Implementation of this logging solution will be purposed later. blueprint unified-logging-in-keystone Change-Id: I860c0f0e935fcd7b4c4886ffd54bf22f2cf4cbb3
* | | | | | Configurable max password length (bug 1175906)Dolph Mathews2013-08-085-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DocImpact Change-Id: I1b1de8f7e07afe8af8a5cbb83de7f935cea04670
* | | | | | Merge "Fix select n+1 issue in keystone catalog"Jenkins2013-08-082-40/+35
|\ \ \ \ \ \
| * | | | | | Fix select n+1 issue in keystone catalogRoman Verchikov2013-08-072-40/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keystone.catalog.backends.sql.get_catalog() and get_v3_catalog() methods generate N+1 select statements for each endpoint. Use sqlalchemy's eager load to generate single select statement instead of generating N+1 select statents for each endpoint. Given change does not modify DB schema and is runtime-only, since it's a one-to-many relationship. Change-Id: Ia72b8603fc13f01696771f6116b320364bd50f51 Fixes: bug #1206725
* | | | | | Merge "extension migrations"Jenkins2013-08-0710-77/+288
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | extension migrationsAdam Young2013-08-0610-77/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow each of the extensions to have their own sql migration repository instead of mixing them into the common repo. db_sync must be called explicitly on the extension. In the past, it was assumed that only migrations for backends backed in sql would be run. In practice, however, all of the migrations were run every time. The code has been modified to reflect this. Adds parameter --extension to the cli for db_sync and db_version to test out the migrations bin/keystone-manage db_sync --extension example will migrate to version 1 and bin/keystone-manage db_sync --extension example 0 will migrate it back to 0 to check the version bin/keystone-manage db_version --extension example blueprint multiple-sql-migrate-repos DocImpact Change-Id: I6852d75bde6506c535fa3d74537e3c1bbd6578d8
* | | | | | Merge "remove swift dependency of s3 middleware"Jenkins2013-08-063-25/+91
|\ \ \ \ \ \
| * | | | | | remove swift dependency of s3 middlewareKun Huang2013-08-023-25/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In middleware/s3_token.py, here only use swift for a logger and path split functionality. We should remove swift dependency by using new codes. fixes bug #1178738 Change-Id: Icc2648720e220a873d1fb8e9961d777ceabef70b
* | | | | | | Merge "Raise max header size to accommodate large tokens."Jenkins2013-08-061-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Raise max header size to accommodate large tokens.Chmouel Boudjnah2013-08-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes bug: #1190149 Change-Id: Icdf56d65b9c5caa46571320f02233ac4a8a2e171
* | | | | | | | Merge "Handle json data when migrating role metadata."Jenkins2013-08-062-3/+25
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Handle json data when migrating role metadata.Mark J. Washenberger2013-07-312-3/+25
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1206257 Change-Id: Ia522e023a2d66ec25bc909db12d358f7c0ee6952
* | | | | | | Merge "Use oslo.sphinx and remove local copy of doc theme"Jenkins2013-08-025-98/+12
|\ \ \ \ \ \ \
| * | | | | | | Use oslo.sphinx and remove local copy of doc themeDoug Hellmann2013-07-085-98/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new oslo.sphinx version of the OpenStack doc theme instead of copying it into this repo. blueprint oslo.sphinx Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com> Change-Id: I0bd91f7bb43f97b99051fed65b75fc05d5149cc8
* | | | | | | | Merge "Fix typo: Tenents -> Tenants"Jenkins2013-08-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo: Tenents -> TenantsFrancois Deppierraz2013-07-301-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cbef892af708368bffe8f503299be3cf8f3c030
* | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-08-0240-1225/+22144
|\ \ \ \ \ \ \ \
| * | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-08-0240-1225/+22144
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I0bbee55edd38f41ed2f32c56a6d17795b81a2f05
* | | | | | | | Merge "Remove kwargs from manager calls where not needed."Jenkins2013-08-026-36/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove kwargs from manager calls where not needed.Morgan Fainberg2013-08-016-36/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the use of kwargs from manager calls where not required. Dogpile.cache (the targeted caching library) does not support kwargs out of the box with its cache-key-generator. This change allows us to support the default cache-key-generator; while it is possible to create a new cache-key-generator function, there are many possible edge-cases to deal with when making cache invalidation calls (ensuring the arguments are the same) as well as possible performance implications (depending on the depth of method introspection needed to determine how to invalidate the cache). As an added bonus, this change brings the code touched more in-line with the rest of keystone where most manager/driver calls do not use kwargs unless absolutley required. blueprint: caching-layer-for-driver-calls Change-Id: I035c976314fb48f657661f681f7c1760d3c547a6
* | | | | | | | | Merge "Clean up use of token_provider manager in tests"Jenkins2013-08-024-7/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Clean up use of token_provider manager in testsBrant Knudson2013-08-014-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 19081b834991d263d84c761dcf422a8c9faf40a1, the token_provider is created in load_backends() so it doesn't have to be created by the tests. This makes the tests using token_provider_api consistent with how other backends are used in the tests. This change only affects unit tests. Change-Id: I9c05c7876bd14fb28e77fe1e49dd509a2a1cb788
* | | | | | | | | Merge "V3 API need to check mandatory field when creating resources"Jenkins2013-08-022-0/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | V3 API need to check mandatory field when creating resourcesxingzhou2013-08-012-0/+30
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating items like project, role through V3 API, if name field is missing, the server will return 500 internal error or 409 conflict error, shall return 400 bad request error instead Change-Id: I9deddcd4cf801306c16555b59bba7fdfab6556a7 Fixes: Bug 1136342
* | | | | | | | | Merge "Update references with new Mailing List location"Jenkins2013-08-022-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update references with new Mailing List locationTom Fifield2013-07-292-2/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yesterday, openstack@lists.launchpad.org was migrated with all users to openstack@list.openstack.org. This patch updates references to the old mailing list with the new, to ensure that people encountering them don't accidentally try and join the old list! Change-Id: I0f8a91a361647a87fab9a1392d56a815f4d66eac
* | | | | | | | | Merge "Sync DB models and migrations in keystone.assignment.backends.sql"Jenkins2013-08-022-10/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sync DB models and migrations in keystone.assignment.backends.sqlElena Ezhova2013-07-312-10/+14
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch syncs models with migrations for: -Domain -GroupDomainGrant -GroupProjectGrant -Role -UserDomainGrant -UserProjectGrant No actual schema change is taking place, this patch just corrects errors in the model definitions. partially implements bp db-sync-models-with-migrations Change-Id: Ib3f22f56a9d00c725f21036ab4bfe4df5fad6876
* | | | | | | | | Merge "add OS-TRUST to links"Jenkins2013-08-022-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add OS-TRUST to linksAdam Young2013-08-012-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1183874 Change-Id: I3881e360485c4c1ff6d67aec12d47130c6b0eb70
* | | | | | | | | | Merge ".gitignore eggs"Jenkins2013-08-021-0/+1
|\| | | | | | | | |
| * | | | | | | | | .gitignore eggsAdam Young2013-07-311-0/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ca595a0d1ba48150187ef7c9ed7f2e808bb6f8e
* | | | | | | | | Merge "use 'exc_info=True' instead of import traceback"Jenkins2013-08-021-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use 'exc_info=True' instead of import tracebackKun Huang2013-07-301-3/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need log traceback message sometime, but people who ignore 'exc_info' argument would import traceback for getting traceback message. This work is already done by 'exc_info' in logging module. For example: logger.error('msg', exc_info=True) # exc_info evaluate as true and log message from sys.exc_info() logger.debug('msg', exc_info=(type, value, traceback)) # exc_info evaluate as an exception tuple and log message from this tuple logger.exception('msg') # exception add exc_info=1 automatically Change-Id: I9e1caf05fcf06bb977597076ebe278b593d70bf4
* | | | | | | | | Merge "Use dependency injection for assignment and identity"Jenkins2013-08-029-20/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use dependency injection for assignment and identityBrant Knudson2013-07-319-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignment and identity backends don't use normal dependency injection because of a circular reference. Support for circular references was added, so these backends can now use normal dependency injection. Fixes: bug 1200769 Fixes: bug 1204605 Change-Id: I8716a65b984c26fcaaf2595463db09e1f02cb475
* | | | | | | | | | Merge "Handle circular dependencies"Jenkins2013-08-024-1/+64
|\| | | | | | | | |
| * | | | | | | | | Handle circular dependenciesBrant Knudson2013-07-314-1/+64
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dependency injection code doesn't handle circular dependencies. This change makes it so that the dependency injection code allows circular dependencies. Part of fix for bug 1204605 Change-Id: I8de166a352ac727c7ddf27bae420b7c7ab22415f
* | | | | | | | | Merge "Clear out the dependency registry between tests"Jenkins2013-08-023-1/+41
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Clear out the dependency registry between testsBrant Knudson2013-07-313-1/+41
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of the process during several tests setUp where the backends are reloaded, automatic dependency injection takes place. The REGISTRY is being updated with new providers and it's also looking up the required dependencies. Some of the providers for the requirements may not have been updated yet with the new provider object, so it loads an object that was created from a previous test run rather than the current one. This can cause tests to fail when one class gets a ref to the old one (it depends on the order that the tests are run). This change clears out the registry of providers before loading backends. It only affects testing. Part of fix for bug 1204605 Change-Id: Ib845493fa13531225e4be7e3b6cc315b9d19a0f4
* | | | | | | Merge "Remove passwords from LDAP queries"Jenkins2013-08-011-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove passwords from LDAP queriesAdam Young2013-07-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1178032 Change-Id: Idca895b1d4d2e611fe834f49b436864a73f4006c
* | | | | | | | Merge "Use keystone.wsgi.Request for RequestClass"Jenkins2013-08-012-4/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Use keystone.wsgi.Request for RequestClassBrant Knudson2013-07-292-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystone defines a custom Request class that's used in many places (middleware, etc.). BaseApplication says that subclasses should typically set Request as the custom RequestClass, but for some reason it's not used in keystone.wsgi.Application. This doesn't cause any problems at this point because Keystone's custom Request is the same as webob.Request. bp user-locale-api requires the custom Request to implement calculating the requested locale, and if Application doesn't set this custom RequestClass then most requests don't using the custom Request. Part of changes for bp user-locale-api Change-Id: If20ee9000aba89a5a2c94ed8a3dda7382142038e