summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fix internal doc links (bug 1176211)Dolph Mathews2013-06-073-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab416c941c7db00d3fd725e1c0e12ed7fc193dd0
* | | | | | | | | Merge "Ignore the .update-venv directory."Jenkins2013-06-102-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Ignore the .update-venv directory.Jamie Lennox2013-06-042-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears to be made when you resume a broken venv creation. It is listed in oslo's pep8 exclude list and .gitignore. Change-Id: I3db570c778ca9c6e0df72f5512ed1a9c643ecb38
* | | | | | | | | Merge "fix error default policy for create_project"Jenkins2013-06-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | fix error default policy for create_projectYejia Xu2013-05-281-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change `admin_or_owner` to `admin_required` bug #1188457 Change-Id: I26b1617eadf12fcf1572bb382f4cdfbcbb275cc4
* | | | | | | | Merge "Raise key length defaults"Jenkins2013-06-085-18/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Raise key length defaultsDirk Mueller2013-06-045-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend RSA keylength to 2048 bits by default, as the previous default of 1024 bit is considered weak since 12/31/2010. Also unify the message_md to the openssl builtin default. Fixes bug 1103002 Change-Id: I70e90b7696f8a56073c3d6bdc9ed5d30cfa3401f
* | | | | | | | | Merge "Missing contraction: Its -> It's (bug 1176213)"Jenkins2013-06-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Missing contraction: Its -> It's (bug 1176213)Dolph Mathews2013-06-071-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I9403289012eea3b78f9bf02154827554d9e07462
* | | | | | | | Merge "Check schema when dropping constraints."Jenkins2013-06-072-45/+75
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Check schema when dropping constraints.Adam Young2013-06-042-45/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL constraints are not named like others. Previous to this patch, we were looking up the names in MySQL's INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS table, but were neglecting to also check the Schema. The same table could be in multiple schemas; as an example a unit test run on the same machine as devstack in two different schemas but the same RDBMS. This patch uses a better approach. Sqlalchemy knows about the name of the constraint, it just doesn't use it in the drop statement by default. The Constraint objects from the main sqlalchemy package don't do drops, only those out of the migrate package. This patch finds the name of the constraint in the constraint bound to the table and passes it to the migrate ForeignKeyConstraint to use in the drop statement Bug 1186353 Change-Id: Ida2184021de9dd220a36507a8a625cf4210d17f7
* | | | | | | | Merge "Import eventlet patch from oslo."Jenkins2013-06-075-25/+96
|\ \ \ \ \ \ \ \
| * | | | | | | | Import eventlet patch from oslo.Jamie Lennox2013-06-055-25/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was abandoned once before: https://review.openstack.org/#/c/25781/ However this is not to do with packaging. This is required if we use eventlet subprocess module (like we should be) in jenkins tests for python2.6. Also imports patch_tox_venv.py. This is a cutdown version of what would happen in run_tests.sh but for tox environments which is how jenkins runs tests now. Change-Id: I369c3e464dfbe3a754f90db58785e97ac87b36c0
* | | | | | | | | Merge "Require keystone-user/-group for pki_setup"Jenkins2013-06-071-2/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Require keystone-user/-group for pki_setupDirk Mueller2013-05-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If pki_setup is run as root, require the keystone-user and keystone-group parameter to be set, to enforce the proper permissions to be created on the files. This follows a suggestion in the Bugreport. Fixes LP Bug #1031372 Change-Id: I00d9e0499d16716af3267914b6b78841f1ad1e0f
* | | | | | | | | Merge "run_tests.sh should use flake8 (bug 1180609)"Jenkins2013-06-061-22/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | run_tests.sh should use flake8 (bug 1180609)Dolph Mathews2013-06-041-22/+23
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing flags (e.g. --pep8) are intentionally left alone. Change-Id: I300aaee17294b88c7d1ba4daad462af407c67d4f
* | | | | | | | Merge "Add db_version command to keystone-manage"Jenkins2013-06-061-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Add db_version command to keystone-manageBrian Waldon2013-06-021-0/+12
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The db_version command simply looks at the database and prints the version to which the database has been migrated. Change-Id: I50098bf1aa6d57883cc9acc0c4d09d9c8448db7f
* | | | | | | | Merge "remove_role_from_user_and_project affecting all users (bug 1170649)"Jenkins2013-06-052-0/+54
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | remove_role_from_user_and_project affecting all users (bug 1170649)Dolph Mathews2013-06-032-0/+54
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I2333404991114e6985f3f2c4de4fb30dc3195b2d
* | | | | | | Merge "split authenticate call"Jenkins2013-06-059-168/+215
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | split authenticate callAdam Young2013-06-039-168/+215
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary step for splitting out the projects also just a cleaner implementation Blueprint extract-projects-from-id Change-Id: I79f9cac4ace6894fba5784bf61c8ef5b4e81d28f
* | | | | | Merge "Ignore conflict on v2 auto role assignment (bug 1161963)"Jenkins2013-06-042-4/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Ignore conflict on v2 auto role assignment (bug 1161963)Dolph Mathews2013-06-032-4/+22
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I10581a39325b4fcdb997ad704c3ee0de494b32e0
* | | | | Merge "typo in 'import pydev' statement"Jenkins2013-06-041-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | typo in 'import pydev' statementVenkatesh Sampath2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: bug #1186069 Change-Id: I6e5225ffe36674b2c02c01175b950acf7e4e2ab5
* | | | | Maintain tokens after role assignments (bug 1170186)Dolph Mathews2013-06-033-30/+75
| |/ / / |/| | | | | | | | | | | Change-Id: Iacd2d9e09be4ab3d6a3c5acf4074e4af7e300602
* | | | Merge "Live SQL migration tests"Jenkins2013-05-314-3/+55
|\ \ \ \
| * | | | Live SQL migration testsAdam Young2013-05-314-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to run the migration tests for the supported databases without editing the config files. Blueprint live-sql-gate Change-Id: Iaf14ad42333b0a0cd1f7d0fb37f135a8bf7af14a
* | | | | Merge "Fix incorrect role assignment in migration."Jenkins2013-05-311-7/+5
|\ \ \ \ \
| * | | | | Fix incorrect role assignment in migration.Jamie Lennox2013-05-311-7/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where a user has existing roles on a project running the migration would assign those same roles to all the user's projects. Change-Id: Ibd99bb7cf6cb84b577eca57f903abf9d48e908c1 Fixes: bug 1186128
* | | | | Merge "Add missing oslo module."Jenkins2013-05-311-0/+1
|\ \ \ \ \
| * | | | | Add missing oslo module.Michael Still2013-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy was being used, and there was a copy in openstack.common, but it didn't appear in the openstack-common.conf config file. Fix that. Resolves bug 1181893. Change-Id: Ib62bec4fcfc6c04d8f53ef503b028c287c4d1c63
* | | | | | Merge "Add index on valid column of the SQL token Backend"Jenkins2013-05-311-0/+17
|\ \ \ \ \ \
| * | | | | | Add index on valid column of the SQL token BackendSylvain Afchain2013-05-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add migration script to add the index Change-Id: I0d7e231b32040dfb57c2e8023a7f45d65416763c Fixes: bug #1168399
* | | | | | | Merge "Fixes a typo"Jenkins2013-05-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixes a typoBrant Knudson2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie5c5fd482312e44b4253076e9d8ebfe75abed378
* | | | | | | | Merge "Document size limits"Jenkins2013-05-311-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Document size limitsDolph Mathews2013-05-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4327593fc970bd977d9fb2c48ab9eafd5586f1d0
* | | | | | | | | Merge "Revert "Set EVENTLET_NO_GREENDNS=yes in tox.ini.""Jenkins2013-05-311-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Set EVENTLET_NO_GREENDNS=yes in tox.ini."Brant Knudson2013-05-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need this since EVENTLET_NO_GREENDNS=yes is set in keystone.common.wsgi_server . This reverts commit 46b224abf1c6f7c9bd579806f202a019e2695b29. Change-Id: I96c2c567f68cdd509425245c7772196918b44b44
* | | | | | | | | | Merge "Disable eventlet monkey-patching of DNS"Jenkins2013-05-312-5/+13
|\| | | | | | | | |
| * | | | | | | | | Disable eventlet monkey-patching of DNSBrant Knudson2013-05-302-5/+13
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change avoids eventlet's monkey-patching of DNS resolution. eventlet's doesn't support IPv6, for example. The way to avoid eventlet's DNS is to set an environment variable. The trick is the environment variable needs to be set before eventlet is imported. A similar change was made in nova, so this is just copying that code and technique to Keystone. This allows re-enabling the IPv6 tests, too. Change-Id: I1e4d4bbfea374d386796d1505a602fd187e75c67
* | | | | | | | | Merge "Test 403 error title"Jenkins2013-05-311-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Test 403 error titleDolph Mathews2013-05-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e2079e485e6e668186cb477027573d9b0adb161
* | | | | | | | | | Merge " Rename requires files to standard names."Jenkins2013-05-318-11/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Rename requires files to standard names.Carlos D. Garza2013-05-248-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename tools/pip-requires to requirements.txt and tools/test-requires to test-requirements.txt. These are standard files, and tools in the general world are growing intelligence about them. Fixes: bug #1179008 Change-Id: I1a19f0c73ab48987e2ff0dade1a57a68b65f0a22
* | | | | | | | | | Merge "Convert openstack-common.conf to the nicer multiline format."Jenkins2013-05-311-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Convert openstack-common.conf to the nicer multiline format.Michael Still2013-05-251-1/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. Change-Id: If197e1f3b3c794e342aaf7d260c107ee04687f82