summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not skip test_user_enable_attribute_mask in _ldap_livetestBrant Knudson2013-08-151-3/+0
| | | | | | | This test is usable with OpenLDAP and is useful for validation. Change-Id: Ie4da746a17d2ca545eb1125c1e7249620f0efbc0 Related-Bug: #1210175
* Skip test_create_unicode_user_name in _ldap_livetestBrant Knudson2013-08-151-0/+3
| | | | | | | | | Live LDAP tests were not passing because this test doesn't work. This is being addressed with a different bug. Change-Id: Ic01aa505d867c1de30e2a1ed7c79ff1478e213ef Related-Bug: #1172106 Related-Bug: #1210175
* Move 'tests' directory into 'keystone' packageSascha Peilicke2013-08-1482-59/+54
| | | | | | | | | | | Similar to a range of other components (e.g. glance,nova,...) and recent reviews by Monty. Running individual tests can be done like this: ./run_tests.sh keystone.tests.test_drivers Change-Id: I2482a48322150e5eb09b703326a94d8283f1c75b
* Merge "Sync notifier module from Oslo"Jenkins2013-08-1434-6/+7351
|\
| * Sync notifier module from OsloLance Bragstad2013-08-1334-6/+7351
| | | | | | | | | | | | | | | | | | | | | | Pull in the common notifier from Oslo-incubator into Keystone. This only introduces the notifier module and it's dependencies. This change is standalone and doesn't contain any code to implementation notifications, just the initial sync. blueprint notifications Change-Id: If62d6012a92e944f3196dd20e6cdd3236e7ecae2
* | Initial implementation of unified-loggingLance Bragstad2013-08-132-92/+9
|/ | | | | | | | | | | | This is the base implementation of a unified logging solution for Keystone from Oslo-incubator. More work is still needed to refactor the rest of Keystone such that it is completely dependent on the implementation from Oslo and not the older keystone/common/logging.py implementation, this is also noted in keystone/common/config.py. blueprint unified-logging-in-keystone Change-Id: I711cbac8edd887c52114fb13327e37124ea86737
* Merge "Move Babel dependency from test-req to req"Jenkins2013-08-132-3/+1
|\
| * Move Babel dependency from test-req to reqJan Provaznik2013-08-122-3/+1
| | | | | | | | | | | | | | | | Recent changes added an undeclared dependency on babel in keystone.openstack.common.gettextutils. Change-Id: I045195e056c555a293371b50cfc3d7ec0c110ba7 Fixes: bug #1211270
* | Merge "Add memcache to httpd doc."Jenkins2013-08-131-1/+11
|\ \
| * | Add memcache to httpd doc.Adam Young2013-08-091-1/+11
| | | | | | | | | | | | | | | | | | Bug 1170455 Change-Id: Id2fc4f14d0c880160c2b6ef6c9922e23fb1cb8a6
* | | Merge "Make pki_setup work with OpenSSL 0.9.x"Jenkins2013-08-131-12/+24
|\ \ \
| * | | Make pki_setup work with OpenSSL 0.9.xDirk Mueller2013-08-071-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for "default" in default_md was only added in "recent" OpenSSL versions. Use sha1 (which is what "default" maps to anyway) for older openssl versions. Also sync the generated openssl config file with the defaults from OpenSSL 1.0 and newer. Fixes: LP Bug #1209249 Change-Id: I4ba79dbfdfc2df81cfb0f1edde23d3fbc1384637
* | | | Merge "Drop extra credential indexes"Jenkins2013-08-133-5/+58
|\ \ \ \
| * | | | Drop extra credential indexesElena Ezhova2013-08-123-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mysql ForeignKey constraints were removed but the fields stayed as indexes. This migration drops them. bp db-sync-models-with-migrations Change-Id: I3baeac4047cd65ac5d7733ba909c45d0874f17d8
* | | | | Merge "Sync models with migrations"Jenkins2013-08-125-10/+19
|\| | | | | |_|_|/ |/| | |
| * | | Sync models with migrationsElena Ezhova2013-08-125-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch syncs models with migrations for: -Endpoint -CredentialModel -TokenModel -TrustModel No actual schema change is taking place, this patch just corrects errors in the model definitions. Made class Index avaliable in keystone.common.sql.core partially implements bp db-sync-models-with-migrations Change-Id: I52f5c455360b65a2d5d884bbbec078dca6d34451
* | | | Merge "Run test_mask_password once"Jenkins2013-08-101-31/+33
|\ \ \ \
| * | | | Run test_mask_password onceBrant Knudson2013-08-011-31/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test_mask_password test doesn't have to run 4 times. Change-Id: If82e8f22d2594dbdf237e9cbe9eba5b944fb2663
* | | | | 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