summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add an update option to run_tests.shMatthew Treinish2013-02-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an update option to run_tests.sh. This option is used to rerun install_venv.py on an already installed venv. This will then just update out of date packages with pip. Change-Id: I8a0a8ba5a9015950bc271f11cbc77308d993fde3
* | | | Merge "Remove usage of UserRoleAssociation.id in LDAP"Jenkins2013-02-191-155/+3
|\ \ \ \
| * | | | Remove usage of UserRoleAssociation.id in LDAPYuriy Taraday2013-02-171-155/+3
| | |/ / | |/| | | | | | | | | | Change-Id: I44c2912e1105598c3279b24da23f83d823ef0e84
* | | | Merge "project membership to role conversion"Jenkins2013-02-1916-185/+427
|\ \ \ \
| * | | | project membership to role conversionAdam Young2013-02-1816-185/+427
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the relationship between users and projects. There is no more direct membership in projects. Instead, all membership is now done via roles. A default role has been created called _member_ with a uuid (both configurable) that will be added in place of the group membership for databse upgrades. DocImpact: https://bugs.launchpad.net/openstack-manuals/+bug/1087483 Change-Id: I2482f9ef7b838e5dade5096d6d00e81db71604d1
* | | | Merge "Add pysqlite as explicit test dep"Jenkins2013-02-191-0/+3
|\ \ \ \
| * | | | Add pysqlite as explicit test depDolph Mathews2013-02-151-0/+3
| | |_|/ | |/| | | | | | | | | | Change-Id: I90d2d43ebeab5f3b638acd45af26272e2119bf50
* | | | Merge "Workaround Migration issue with PostgreSQL"Jenkins2013-02-191-2/+5
|\ \ \ \
| * | | | Workaround Migration issue with PostgreSQLDirk Mueller2013-02-181-2/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For unknown reason, SQLAlchemy-Migrate does not pass the populate_default=True down to the ALTER TABLE statement. Therefore, create the column in two steps, which avoids the IntegrityError. Fixes LP Bug 1068181 Change-Id: I30770d8b29ec442576a66fc07b2c78e2440fb328
* | | | Merge "Silence routes internal debug logging"Jenkins2013-02-181-0/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Silence routes internal debug loggingDolph Mathews2013-02-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminates this spam while running keystone in debug: routes.middleware: DEBUG: Initialized with method overriding = True, and path info altering = True Change-Id: I1ff1fb13b4bfea968a2ba8fe194141c98541c6b8
* | | | Remove test_auth_token_middlewareDolph Mathews2013-02-182-669/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | This file has been moved to keystoneclient along with auth_token: https://github.com/openstack/python-keystoneclient/blob/master/tests/test_auth_token_middleware.py Change-Id: Ia17dfd249000055e845f4a46374ce3a3bc5dda8a
* | | Merge "Update to oslo version code."Jenkins2013-02-175-165/+222
|\ \ \
| * | | Update to oslo version code.Monty Taylor2013-02-135-165/+222
| | | | | | | | | | | | | | | | | | | | | | | | This brings us tag-based versioning and aligned with the rest of the project. Change-Id: I8c1f077125ee062e213d073492cfde07694cc254
* | | | Merge "remove unneeded config reloading (it's already done during setUp)"Jenkins2013-02-161-55/+0
|\ \ \ \
| * | | | remove unneeded config reloading (it's already done during setUp)Ionuț Arțăriși2013-02-081-55/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4341b6c00dfe2354a13bfa4cb2a6ed5d1441f4cb
* | | | | Merge "add missing kvs functionality (bug1119770)"Jenkins2013-02-1610-66/+28
|\ \ \ \ \
| * | | | | add missing kvs functionality (bug1119770)Gordon Chung2013-02-1410-66/+28
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add list_projects mod list_groups, list_domains, get_project_users to match sql response not adding list_user_projects fix list_projects to return refs drop get_projects and get_all_projects Change-Id: Ifa1433918b8770cd7d59f36f71f2e6b935625ae5
* | | | | Merge "Cleaned up keystone-all --help output"Jenkins2013-02-163-57/+73
|\ \ \ \ \
| * | | | | Cleaned up keystone-all --help outputDolph Mathews2013-02-123-57/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a missing space: mayuse -> may use - Removed default values from help messages, which were appearing as None, and should be added by argparse anyway - Updated man pages Change-Id: I471a1aaff40398488e19f91a16bd91d2d17db61d
* | | | | | Merge "Fix bugs with set ldap password."Jenkins2013-02-161-0/+1
|\ \ \ \ \ \
| * | | | | | Fix bugs with set ldap password.Mandell Degerness2013-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no check that 'name' exists in the keys. Client update password call expects update_user to return the new user as do the kvs and sql back ends. Change-Id: I1b7af9b9225fa06a9404d0a54cd1ef7b6e5cda80
* | | | | | | Merge "fix unit test when memcache middleware is not configured"Jenkins2013-02-161-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix unit test when memcache middleware is not configuredIonuț Arțăriși2013-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: keystoneclient.middleware.auth_token: INFO: Starting keystone auth_token middlewa re keystoneclient.middleware.auth_token: INFO: Using /opt/stack/keystone/examples/pk i/certs as cache directory for signing certificate keystoneclient.middleware.auth_token: DEBUG: Authenticating user token keystoneclient.middleware.auth_token: DEBUG: Removing headers from request enviro nment: X-Identity-Status,X-Tenant-Id,X-Tenant-Name,X-User-Id,X-User-Name,X-Roles, X-Service-Catalog,X-User,X-Tenant,X-Role keystoneclient.middleware.auth_token: DEBUG: Keystone did not return json-encoded body keystoneclient.middleware.auth_token: DEBUG: Marking token invalid-token as unaut horized in memcache keystoneclient.middleware.auth_token: DEBUG: Token validation failure. Traceback (most recent call last): File "/opt/stack/python-keystoneclient/keystoneclient/middleware/auth_token.py" , line 574, in _validate_user_token data = self.verify_uuid_token(user_token, retry) File "/opt/stack/python-keystoneclient/keystoneclient/middleware/auth_token.py" , line 824, in verify_uuid_token self._cache_store_invalid(user_token) File "/opt/stack/python-keystoneclient/keystoneclient/middleware/auth_token.py" , line 794, in _cache_store_invalid self._cache_store(token, 'invalid') File "/opt/stack/python-keystoneclient/keystoneclient/middleware/auth_token.py" , line 771, in _cache_store timeout=self.token_cache_time) TypeError: set() got an unexpected keyword argument 'timeout' keystoneclient.middleware.auth_token: DEBUG: Marking token invalid-token as unaut horized in memcache This can be reproduced on devstack. Fixes bug 1102520 Change-Id: Ib9e110d60df40e30d74c3059bd25e459a95f9850
* | | | | | | Merge "adding additional backend tests (bug1101244)"Jenkins2013-02-144-0/+619
|\ \ \ \ \ \ \
| * | | | | | | adding additional backend tests (bug1101244)Gordon Chung2013-02-134-0/+619
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I36597184818b0c34fd614252b5af239e02fc411f
* | | | | | | Merge "Tenant update on LDAP breaks if there is no update to apply"Jenkins2013-02-141-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Tenant update on LDAP breaks if there is no update to applyJose Castro Leon2013-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1117362 Change-Id: Ia47f8a7cd38dcaaceafed39cbdd837ba9a67969f
* | | | | | | | Merge "don't create a new, copied list in get_project_users"Jenkins2013-02-141-14/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | don't create a new, copied list in get_project_usersIonuț Arțăriși2013-02-041-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also replace other for loops with list iterations Change-Id: I3d6dc40f108b6f235a6c6d43a867c91845f442cd
* | | | | | | | | Merge "add check for config-dir parameter (bug1101129)"Jenkins2013-02-141-7/+12
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | add check for config-dir parameter (bug1101129)Gordon Chung2013-02-051-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cd454cc3c5bf5da9656c05e9a22385ffcd01147
* | | | | | | | | Merge "Fix test_contrib_s3_core unit test"Jenkins2013-02-131-3/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix test_contrib_s3_core unit testmathrock2013-02-101-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running the full suite of run_tests.sh the test_contrib_s3_core tests run fine, however when run standalone the tests fail Change-Id: I287d05aaab40f441dca9fdca0a5dc6bee1fd073d Fixes: bug #1120896
* | | | | | | | | Merge "Fix spelling mistakes"Jenkins2013-02-1312-13/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix spelling mistakesJoe Gordon2013-02-1212-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git ls-files | misspellings -f - Source: https://github.com/lyda/misspell-check Change-Id: Icbd2412aa65bc8135e5dcd83ee69e94f5a42f7a2
* | | | | | | | | | Merge "Keystone backend preparation for domain-scoping"Jenkins2013-02-1226-288/+1261
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Keystone backend preparation for domain-scopingHenry Nash2013-02-1226-288/+1261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes lay the ground work for the implmentation of domain-scoping, but are benign in that they don't change the token. They include making domain_id a first-class attribute in the user and project entity (i.e. move it out of the 'extra' attribute), filling in domain grant and project support for the kvs backend and fixing a series of issues in the mirgation to make it work for both MySQL, Postgresql and sqlite. A further, separate, commit will actually provide the code to update the actual tokens once the v3 token support has been added. blueprint domain-scoping blueprint default-domain Change-Id: I55ab7947a6a1efbab003bd234856bd3805bb4a63
* | | | | | | | | | | Merge "Use install_venv_common.py from oslo."Jenkins2013-02-123-93/+260
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use install_venv_common.py from oslo.Matthew Treinish2013-02-123-93/+260
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This syncs install_venv_common.py from oslo and reworks the tools/install_venv.py script to use the new library. Change-Id: I68fe3449ed0fcc7fdfb84af2dcc77a39ebde7f01
* | | | | | | | | | Merge "Spell accommodate correctly."Jenkins2013-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Spell accommodate correctly.Dan Prince2013-02-121-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling issue from 8ec247b (security patch). Change-Id: I16c048e40fd92c1978e93fe74a76b4303c253d65
* | | | | | | | | | Merge "Missed import for IPv6 tests skip."Jenkins2013-02-121-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Missed import for IPv6 tests skip.Yuriy Taraday2013-02-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id239089ddf838442a03e5a920237b626fecd358d
* | | | | | | | | | Merge "allow unauthenticated connections to an LDAP server"Jenkins2013-02-122-7/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | allow unauthenticated connections to an LDAP serverIonuț Arțăriși2013-02-082-7/+25
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: bug 1119495 Change-Id: I13cdc212752f212ecf59a6a83f8f32c042ccf6e0
* | | | | | | | | | Merge "Add missing log_format, log_file, log_dir opts."Jenkins2013-02-121-0/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Add missing log_format, log_file, log_dir opts.Dan Prince2013-02-111-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 49447c2 we broke keystone in that config.py no longer provides the options it uses. This commit fixes that by adding back in conf.log_format, conf.log_file, and conf.log_dir ... all of which are used and required by config.py. Fixes LP Bug #1122403. Change-Id: I5015315724eab511f6c570fdd5b9be357777b4a0
* | | | | | | | | | Merge "Generate apache-style common access logs"Jenkins2013-02-126-19/+127
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Generate apache-style common access logsDolph Mathews2013-01-316-19/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taking advantage of this middleware either requires enabling verbose/debug or utilizing an external logging.conf which configures an 'access' logger. Example output: 127.0.0.1 - - [2013-01-29T17:15:02.752214] "GET http://localhost:5000/v3/projects HTTP/1.0" 200 16 This patch also revises etc/logging.conf.sample with some more practical defaults (e.g. supporting externally-managed log rotations) in addition to illustrating how to generate an 'access.log' file. DocImpact Change-Id: I2a6048fa5fbf8661a6859d9e3a259d4cfa5fc589