summaryrefslogtreecommitdiffstats
path: root/keystone/openstack
Commit message (Collapse)AuthorAgeFilesLines
* Sync unified logging solution from OsloLance Bragstad2013-08-096-40/+935
| | | | | | | | | | | | 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
* Sync-up crypto from oslo-incubatorSimo Sorce2013-07-112-0/+179
| | | | | blueprint key-distribution-server Change-Id: Id57f25d4d0bb609046276cfb4df43bd3d29b4f23
* Add KEYSTONE_LOCALEDIR env variableMark McLoughlin2013-05-291-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | Part of fixing bug #995287 Syncs these two commits from oslo-incubator: Support overriding oslo localedir too Add a gettextutils.install() helper function to get a new gettextutils.install() function which allows the default localedir to be overwritten via an environment variable. A few things to note: - the gettext.install() call is moved from common.config to the toplevel scripts to fix cases (e.g. the legacy auth_token middleware) where keystone code might be imported by a program who's default translation domain is not 'keystone'. - we add a gettext.install() call in keystone.test so that tests have the _() builtin installed. Change-Id: I86562b3a65d371673bb21f7179eecc7602bc0775
* Migrate to pbr.Monty Taylor2013-05-232-461/+0
| | | | | | Closes bug 1179007 Change-Id: I9d2a0190bb8dc31ea481909a4e0af3008aa976bf
* Sync with oslo-incubator copy of setup.pyDavanum Srinivas2013-04-141-2/+2
| | | | | | Keep up with the changes to the master copy Change-Id: I48de020385fafa7ce10a6bcb2c89d25b9fcba929
* Sync with oslo-incubator.Russell Bryant2013-03-255-43/+76
| | | | | | Up to date as of 575e74d352d685773513218a286979bb58920246. Change-Id: I302bd832fdd4ee6a325b600aceba525b109bb4e1
* Sync timeutils with osloAdam Young2013-03-051-9/+58
| | | | | | Necessary for the microsecond precision changes Change-Id: I2571af24b338a5245bc62944a891ed889cf30d4d
* Merge "Update the Keystone policy engine to the latest openstack common"Jenkins2013-02-192-0/+812
|\
| * Update the Keystone policy engine to the latest openstack commonHenry Nash2013-02-192-0/+812
| | | | | | | | | | | | Fixes Bug #1126037 Change-Id: I246bc9c0c2eb0f4af97c11588c80e4bcea06e747
* | Use oslo-config-2013.1b3Mark McLoughlin2013-02-182-1861/+0
|/ | | | | | | | | | | | | | | The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b3 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
* Update to oslo version code.Monty Taylor2013-02-132-120/+189
| | | | | | This brings us tag-based versioning and aligned with the rest of the project. Change-Id: I8c1f077125ee062e213d073492cfde07694cc254
* Sync latest cfg from oslo-incubatorMark McLoughlin2013-01-222-66/+19
| | | | | | | | | | | | | | | Changes include: c5984ba Move logging config options into the log module 7cf016a Fixing the trim for ListOp when reading from config file The most significant change is that cfg no longer provides logging config options as these have been moved to the log module which keystone does not yet use. Define these options in keystone.config where they are used since pulling in oslo logging isn't appropriate if we're not going to use it. Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6
* Port to argparse based cfgMark McLoughlin2012-12-051-163/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync the following changes from oslo-incubator: 3557d84 Fix ListOpt to trim whitespace 01ab910 Fix set_default() with boolean CLI options af18eaa Improve cfg's argparse sub-parsers support f21e1d9 Fix regression with cfg CLI arguments ceb4aa7 Fix broken --help with CommonConfigOpts 5e9503b Hide the GroupAttr conf and group attributes b6d24bb updating sphinx documentation 403509e Don't reference argparse._StoreAction e17deb8 Fix minor coding style issue 0c29e1d Remove ConfigCliParser class 5b9cb41 Add support for positional arguments dbc72a6 Use stock argparse behaviour for optional args 768a147 Use stock argparse --usage behaviour ac180b9 Use stock argparse --version behaviour 0787e38 Remove add_option() method 5afead0 Completely remove cfg's disable_interspersed_args() 5f564b2 argparse support for cfg d7b6397 Add a missing comma in a docstring. aca1805 cfg: fix required if option has a dash The main API change affecting keystone is that CONF() no longer returns unparsed arguments. The keystone-manage command is updated to use argparse sub-parsers to achieve the same effect. Change-Id: Ie8972ce851f1247d8710e9e0611bb3e2f843cb45
* Update common.Michael Still2012-10-183-54/+242
| | | | Change-Id: I161ee53e0e087da963b62ac5353d3bdf04b5cc22
* Cleanup PEP8 errors from CommonAdam Young2012-09-072-3/+4
| | | | Change-Id: Ibd4fec8b38ba33168c271a8efed65dbf598bd372
* Sync some misc changes from openstack-commonMark McLoughlin2012-09-053-7/+41
| | | | | | | | | | | | | | | Syncs the following changes from stable/folsom: 769ec65 Don't trap then re-raise ImportError. 202b8b7 Fix spelling typos 01b4f31 Support for marshalling datetime while preserving microseconds. c11a0d4 Remove unused imports 9e1bd9d Add missing convert_instances arg. 2d6f847 Track to_primitive() depth after iteritems(). 8c74b37 Improve exception from importutils.import_class(). 1fb2361 add import_object_ns function Change-Id: Id5885f4a00207cf70f15f195a154c45903111b8b
* Sync latest cfg from openstack-commonMark McLoughlin2012-09-052-41/+138
| | | | | | | | | | | | | | | | | | | | Syncs the following changes from stable/folsom: 4dc2043 cfg: clean up None value handling 513bd3a Allow set_default and set_override to use None 0a36c92 Tilde expansion for --config-file and --config-dir 038d597 Add import_opt() method to ConfigOpts 90da88c Modifies _is_opt_registered fcn to check for duplicate opts 3af0786 cfg: Fix typo in documentation 9f93872 Update common code to support pep 1.3. bug 1014216 fb0f00e Use 'is not None' instead of '!= None' d1ec5ce Add support to include config aliases Also, exclude keystone/openstack/common from pep8 checks because it is pep8-checked in openstack-common anyway and all pep8 fixes would need to go into openstack-common first. Change-Id: Ie6354251942648c16c2be270af2b95f3f45e27ed
* Remove unused variablesRongzeZhu2012-08-171-1/+0
| | | | | | | | 'reqs_in' in openstack.common.setup.get_reqs_from_files is unused. 'dialect' in common.sql.migrate_repo.versions.001_add_initial_tables is unused. Change-Id: Ic2ae2873cef1978eefe03148861fedd5a4a013b2
* Sync jsonutils from openstack-commonVincent Untz2012-07-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes keystone work with recent versions of anyjson. Changes from openstack-common: commit ce3071437d1871f77c4d8573cbe5f4ea8c817650 Author: Russell Bryant <rbryant@redhat.com> Date: Mon Jul 16 10:30:25 2012 -0400 Use strtime() in to_primitive() for datetime objs. This patch updates jsonutils.to_primitive() to use timeutils.strtime() to convert a datimetime object to a string instead of just using str(). This ensures that we can easily convert the string back to a datetime using timeutils.parse_strtime(). Required for the nova blueprint no-db-messaging. Change-Id: I725b333695930e12e2832378102514326fec639c commit 4c9d439ef24f5afdd74aa9153aa8fc772051e6cb Author: Tim Daly Jr <timjr@yahoo-inc.com> Date: Tue Jun 26 02:48:42 2012 +0000 Add 'filedecoder' method to the jsonutils wrapper module. Fixes bug #1017765 After version 3.3.2, the anyjson library will throw a KeyError if filedecoder isn't present. The filedecoder is just like the decoder except it takes a file instead of a string, like json.load() instead of json.loads(). Change-Id: I7bd012a7b4afa9b1ec987c3e6393cc922b5dadff Change-Id: Icfd5c39c322ed6e73148c7f5ae03f704a3aa160e
* Keystone should use openstack.common.timeutilsZhongyue Luo2012-06-291-0/+109
| | | | | | | | | | | Implements blueprint use-common-timeutils 1. Edit openstack-common.conf and import keystone/openstack/common/timeutils.py 2. Replace datetime.utcnow with timeutils.utcnow 3. Replace utils.isotime with timeutils.isotime 4. Remove utils.isotime in common/utils.py and datetime related unittest Change-Id: I4f5a63a368fde8787a0dc0a817c940de685b9ca2
* Keystone should use openstack.common.jsonutilsZhongyue Luo2012-06-281-0/+140
| | | | | | | | | | | Implements blueprint use-common-jsonutils 1. Edit openstack-common.conf and import keystone/openstack/common/jsonutils.py 2. Remove json package imports and replace with jsonutils Client code in vendor/ hasn't been changed Change-Id: I57c670fde9f2c2241eddab1b012e8d5e6a72deb7
* Utilize newer changes in openstack-common.Bhuvan Arumugam2012-06-211-0/+38
| | | | | | | | | | | | Use common.setup.get_cmdclass() to clean-up redundant code. * keystone/openstack/common/setup.py Sync from openstack-common project. * setup.py Code clean-up. No functional change. Change-Id: I12f538ba8e727270b3b615dc06b0fd0328f36e1e
* PEP8 fixesDolph Mathews2012-06-183-19/+18
| | | | Change-Id: I0989396691eb31d9008c016e64f2c197f8c7e48c
* Use cfg's new global CONF objectMark McLoughlin2012-06-131-88/+160
| | | | | | Implements blueprint cfg-global-object Change-Id: Ic53b41dafa8666ce21f33697f7e8697f1e5cb0fd
* Merge "Sync with latest version of openstack.common.cfg"Jenkins2012-06-051-15/+86
|\
| * Sync with latest version of openstack.common.cfgMark McLoughlin2012-05-291-15/+86
| | | | | | | | | | | | | | | | | | | | | | Changes since last sync: - make reset() clear defaults and overrides - automatically create option groups - allow options to be marked as required - use a list comprehension instead of map() Change-Id: Id259a7ffe791a7e272fcc8bb21d7d0bc4f9e591d
* | Keystone should use openstack.common.importutilsZhongyue Luo2012-06-041-0/+44
| | | | | | | | | | | | Implements blueprint use-common-importutils Change-Id: I597f71dc72aa3b87a454c4a23ca1b5328e222f76
* | PEP8 fixesDolph Mathews2012-06-011-1/+1
|/ | | | Change-Id: I957311f7e2f371217d8812c7319b87623e8972e9
* Fixes some pep8 warning/errors.Chmouel Boudjnah2012-05-241-1/+0
| | | | | | - Using flake8 so a bit more than that. Change-Id: I63fa21f7d3d02f96c0c56804fdd56da37c952d7d
* Merge "Truly handle mailmap entries for all combinations."Jenkins2012-05-181-1/+2
|\
| * Truly handle mailmap entries for all combinations.Bhuvan Arumugam2012-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 994957 Mailmap might contain mapping with full name. This commit fixes it to handle these combinations: Foo ZZ <email@foo.com> Bar YY <email@bar.com> Foo <email@foo.com> Bar <email@bar.com> <email@foo.com> <email@bar.com> This is inline with mailmap convention described here: http://man.github.com/git/git-shortlog.html * keystone/openstack/common/setup.py parse_mailmap(): Pull out canonical and alias email addresses. * keystone/tests/test_setup.py New test script to cover various combinations in mailmap. Change-Id: I471172aa012f37e499e86ffeb74c30ebcdb89b00
* | Use ConfigOpts.find_file() to locate policy.jsonMark McLoughlin2012-05-031-18/+78
|/ | | | | | | | Use cfg's new helper method to find policy config file. The basic behavior is "look alongside the config file" with a fall back to the standard default config paths. Change-Id: Ic2a7187378eab9c9066118132465280993778a5e
* Sync to newer openstack-commonMark McLoughlin2012-05-032-33/+91
| | | | | | | | | | | | | | | Changes since last sync are: - cfg: * Support for directory source of config files * Provide file extension when when looking for files * Some refactoring of the cfg cache * Add caching to openstack.common.cfg - setup: * Handle authors existed before VCS was around. Change-Id: If3f0515a911a315dc1329b99299fdbc3592fce24
* Auto generate AUTHORS file for keystone component.Bhuvan Arumugam2012-04-301-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 976267 Now that git commits are gated by CLA, we shouldn't enforce committers to add an entry in AUTHORS file. The AUTHORS file should be generated automatically, based on git commits. This commit fixes the problem. * AUTHORS Remove this file. * .gitignore Add AUTHORS file. * keystone/openstack/common/setup.py generate_authors(): New method to create AUTHORS file. If AUTHORS.in file exists, append it's content to AUTHORS file. * setup.py Import the new method. local_sdist.run(): Generate AUTHORS file before creating the package. * tests/test_authors.py Remove this test case. Change-Id: Id3ca59382e417d054d14f7735f30595bfbe2df48
* Import latest openstack-commonMark McLoughlin2012-04-102-53/+280
| | | | | | | Main change is the MultiStrOpt support which pulls in the new iniparser module. See lp#955308. Change-Id: I1358f09038113873e60343f00a95229002b58c1f
* Align with project configs.Monty Taylor2012-03-012-1/+127
| | | | | | | | * docs in doc/ rather than docs/ * write out changelog from git * freeze requirements file Change-Id: If28d5414f7b2747fd6835546c45e1acfac8a3563
* Use cfg's new print_help() methodMark McLoughlin2012-02-231-0/+4
| | | | Change-Id: Ib8e5dc50bc9773d13b8d9c741676477aa0f001e0
* Update cfg from openstack-commonMark McLoughlin2012-02-232-72/+148
| | | | | | | | | Use openstack-common's update script to sync it to the latest. Add some dire warnings that changes should be made in the upstream copy of the code first. Change-Id: Ib89efdecc7f8a00f2a7fc2824b519f211d3d784c
* Move cfg to keystone.openstack.commonMark McLoughlin2012-02-233-0/+1131
Just code movement here, no changes. This is so we can use openstack-common's update script to keep it in sync. See: http://wiki.openstack.org/CommonLibrary#Incubation Change-Id: Ieb8ce50071a85987152b995fa6773433b7671c48