summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix lack of parenthesis around boolean logic1.11.1Monty Taylor2015-11-202-1/+41
| | | | | | | | The legacy envvar prefix support broke a workaround for use of OS_ envvars in test cases. This is only currently a problem for shade functional tests, but it IS a bug. Change-Id: Ia0cbb4e2ea7ce6eeeea36533e057bd53a830d44c
* Only pass timeout to swift if we have a value1.11.0Monty Taylor2015-11-192-5/+39
| | | | | | | swiftclient does not have the built-in None detection that keystoneauth has, so we have to do it ourselves. Change-Id: I3fcf60dd2f3350045b824899ac48b02809452a4b
* Merge "Add support for legacy envvar prefixes"Jenkins2015-11-192-8/+30
|\
| * Add support for legacy envvar prefixesMonty Taylor2015-11-132-8/+30
| | | | | | | | | | | | | | | | | | | | In trying to move the legacy clients to do their config via os-client-config, many of them had prefixes like NOVA_ or GLANCE_ in their shells. It's pretty easy to support optionally passing those in so that the transition to OCC is less of a change and we can treat the deprecation cycle of those features as a different topic. Change-Id: Ic819c0790989fa034db03d83535ee7b70aaacc3a
* | Fix name of the object-store api keyMonty Taylor2015-11-142-3/+3
| | | | | | | | | | | | | | | | | | | | There is only one value for this, and it's not consumed in the process of making a swift client, so the chances that anyone set it to something else are pretty much nil. However, for completeness we should make it the right name, as "object-store" is the service key name for swift, not "object". Change-Id: I395c1c44a2f50996b61dff22e07149b8dd13eda9
* | Refactor per-service key makingMonty Taylor2015-11-142-8/+33
|/ | | | | | | | | The key for swift is object-store, but the key in the config dict would be object_store_api_version, so the key concatenation would not work. In fixing that, refactor out the creation of the keys so that the concatenation and transformation needed always happens. Change-Id: Ic095912bfc84f13ef8b11f312303a517289e0441
* Merge "Add method to get a mounted session from config"Jenkins2015-11-122-0/+40
|\
| * Add method to get a mounted session from configMonty Taylor2015-11-052-0/+40
| | | | | | | | | | | | | | | | Getting a session is great, but sometimes you need a thing called an "adapter" which takes 5 parameters which are all already contained in the config that you used to get the session. Change-Id: Id4e418cd04ae81540d9898f7b2e959b974f355d2
* | Merge "Use requestsexceptions for urllib squelching"Jenkins2015-11-122-12/+4
|\ \
| * | Use requestsexceptions for urllib squelchingMonty Taylor2015-11-042-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | The code to deal with this properly is quite sharable and we should not care. Use requestsexceptions from the Infra team to handle it. Change-Id: Ie20a3e1b2d8d18a4a76b34219cf12510cb1cda98 Depends-On: I52249b6d2fe04c49a9f4ed139d7625c890309ca8
* | | Merge "Remove unneeded workaround for ksc"Jenkins2015-11-122-7/+3
|\ \ \
| * | | Remove unneeded workaround for kscMonty Taylor2015-11-082-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out keystoneclient can take string input and does the same transform we're doing here, it's just not documented. Remove the workaround on our side as it's unneccesary. Change-Id: Ie46945f7d96e3d65004cd19823b3be989e1d18a7
* | | | Fix JSON schemaDavid Shrewsbury2015-11-101-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | We incorrectly refered to things with _api_ in the name. Change-Id: I9130ae0f72484957d0a8943eceabcd6a6bc21c91
* | | | Merge "Workaround a dispute between osc and neutronclient"1.10.2Jenkins2015-11-092-1/+5
|\ \ \ \
| * | | | Workaround a dispute between osc and neutronclientMonty Taylor2015-11-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python-openstackclient wants network_api_version to be 2. neutronclient wants it to be 2.0. There is a patch to OSC to make it understand both, but in the mean time, let's unbreak people. Change-Id: I4d8f187d1302c5bcfa246e017e6c6d8af9c3f733
* | | | | Merge "Workaround for int value with verbose_level"Jenkins2015-11-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Workaround for int value with verbose_levelMonty Taylor2015-11-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python-openstackclient uses an int value for verbose level which the stringification patch broke. As a quick fix, special case verbose_level, as fixing it properly might take more than 5 minutes. Change-Id: Ie12a40d3d3e400b3ec2103d7a58c4902fb10fc2d Closes-Bug: #1513919
* | | | Add default API version for magnum serviceMonty Taylor2015-11-081-0/+1
|/ / / | | | | | | | | | | | | | | | | | | shade is adding magnum support, so we should probably grow a default value for the container_api_version. Change-Id: I2551f2921f10ba109ccb52301cc8ad23c5f81c46
* | | Work around a bug in keystoneclient constructor1.10.1Monty Taylor2015-11-062-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keystoneclient bug #1513839 means that even when you proerly pass a Session (like we do) to the discovery constructor (what you'd be calling if you were passing "pass_version_arg = True") ksc fails because you didn't send a URL. We _HAVE_ an appropriate URL that we can pull from the Session. So until ksc learns how to pull the URL from the Session itself, do it for them. Change-Id: I38eb4cfa750fab5196b86989c2cd498d41bf37ac
* | | Return cache settings as numbers not stringsMonty Taylor2015-11-063-8/+19
| |/ |/| | | | | | | | | | | While we're at it, let's also put in some tests to ensure that we're processing data types properly. Change-Id: I0442d234e8422a58738612b2da114f61cc9afc5c
* | Merge "Don't assume pass_version_arg=False for network"1.10.0Jenkins2015-11-052-12/+13
|\ \
| * | Don't assume pass_version_arg=False for networkMonty Taylor2015-11-052-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Excitingly, one of the places where we hard-code a workaround for a differently behaving client is not needed. The Client in neutron that takes a version arg is in neutronclient.neutron.client. Also, pass the version arg as positional when we pass it, as some of the clients (neutron) require it, and all accept it. Change-Id: Ifcbaab782173b95a678af0b2792a1194b198b687
* | | Convert floats to stringDavid Shrewsbury2015-11-051-0/+2
|/ / | | | | | | | | | | We do it for int values, so floats should be covered, too. Change-Id: I1b98f7887ad421596b3bfdf2f6ad871a7d7f6bb2
* | Update network api version in defaults.jsonMonty Taylor2015-11-051-1/+1
| | | | | | | | | | | | | | | | | | neutronclient expects 2.0, not 2 - but we'd not noticed because all of the consumption of client constructors were bypasing the version arg for neutron. In a follow-up patch we'll fix that, but the value in defaults.json is just straight wrong. Change-Id: I684c4ef063193355c6cf936d4f18576db919762b
* | Dont turn bools into stringsMonty Taylor2015-11-052-0/+3
|/ | | | | | It turns out that requests does not like that. Change-Id: I206be8107f5cfaaa7dc7f34ab0b0764e0dc3fb0d
* Normalize int config values to stringMonty Taylor2015-11-041-0/+2
| | | | | | | We have no things that expect actual int values. It's easy to write ints in yaml though - so normalize them to strings. Change-Id: I58cfdda697da9b7e030f4165ef8e60f4e9d00b66
* Merge "Disable spurious urllib warnings"Jenkins2015-11-041-0/+19
|\
| * Disable spurious urllib warningsMonty Taylor2015-11-031-0/+19
| | | | | | | | | | | | | | Since we can return a keystoneauth1 Session correctly, disable the stupid warnings that are evil and never should be emitted. Change-Id: I128e4587ab07a20c7c5da745b12e4f5d0a3ee5a7
* | Merge "Add logging module support"Jenkins2015-11-032-0/+30
|\ \ | |/
| * Add logging module supportMonty Taylor2015-11-032-0/+30
| | | | | | | | | | | | | | | | The _log.py module is from shade and is just basic logging support that does not emit warnings if the consumer does not have logging enabled. Change-Id: Id4639763cf488eb7cd0c27904be055a7843e287f
* | Merge "Add methods for getting Session and Client objects"Jenkins2015-11-033-0/+276
|\ \ | |/
| * Add methods for getting Session and Client objectsMonty Taylor2015-11-033-0/+276
| | | | | | | | | | | | | | | | | | These come originally from the shade library, but are helpful for things like the client libs themselves. Once one has a CloudConfig, there is really one and only one correct way to get both a session and a Client. Change-Id: I1b4d4321828864fddab85a127fbf63f4c8384ab9
* | Update conoha's vendor profile to include SJCMonty Taylor2015-11-032-2/+2
|/ | | | | | Turns out the lon region is not really a thing. Change-Id: Ib315c301d5f8b589006a61d2a255a6b295b1b9a5
* Use json for in-tree cloud dataMonty Taylor2015-11-0344-174/+661
| | | | | | | | | | | | | | In preparation for sharing the default and vendor data with other projects, potentially even non-python ones, move the data into json format, which is slighly less exciting to read, but has more widespread standard library support. The user-facing config file will still be in yaml format, because that's easier on the eyes and it's expected to be read and edited by humans. Continue to accept yaml everywhere, because an end user may have dropped a yaml config file into a dir somewhere, and that's fine. Change-Id: I269d31e61da433ac20abb39acdde0f9f9fe12837
* Update auro to indicate move to neutronMonty Taylor2015-11-022-5/+1
| | | | | | Auro runs neutron now. Update the config and the docs to reflect that. Change-Id: I4d2fd12b6f3d93f9e1d201b687145f1fe022e593
* Copy values in backwards_interface differentlyMonty Taylor2015-11-021-2/+5
| | | | | | | There is the world's weirdest race condition in the unit test for this on python 3.4. Change-Id: Idee8320f03651964600ba0822edfff04f880ea4a
* Fix typo in Catalyst region configsXav Paice2015-11-032-2/+2
| | | | | | Small typo making one region not useful for customers (my bad!). Change-Id: If2680b521f92789f2621aa1249b304666fcde95b
* Merge "Aligned a few words in the docs"Jenkins2015-11-011-5/+5
|\
| * Aligned a few words in the docsMonty Taylor2015-10-271-5/+5
| | | | | | | | | | | | | | | | We say "not supported" when the cloud doens't do something, but there were two places where we used other words. Fix them. Also, make the image properties a blockquote. Change-Id: Id933f7d38d706c6fb3ed9f59ad10c2e1e2d73c43
* | Merge "Sort vendor list"Jenkins2015-11-011-120/+120
|\ \ | |/
| * Sort vendor listMonty Taylor2015-10-271-120/+120
| | | | | | | | | | | | | | We've got enough of them that the arbitrary sort order was a bit weird. Sort alphabetically. Change-Id: I6d4ec563f03d1b25bad7d8337db90007a562e97c
* | Merge "Add conoha public cloud"Jenkins2015-11-012-0/+23
|\ \ | |/
| * Add conoha public cloudMonty Taylor2015-10-272-0/+23
| | | | | | | | Change-Id: I05a716bc54c98390a7cbeb352338a7c6cd7e86c3
* | Merge "Allow for templated variables in auth_url"Jenkins2015-11-011-0/+7
|\ \ | |/
| * Allow for templated variables in auth_urlMonty Taylor2015-10-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | Some clouds have auth_urls per region, which means putting a static auth_url in the config file isn't going to work. Allow {} substitutions in the auth_url so that other elements of the auth dict can be injected. This will not solve _everything, but it will solve all of the currently identified issues, and should be upwardly open if we need something more complex later. Change-Id: I6107d0669734647cfa0bef118bdf7739949991ad
* | Merge "Use assertDictEqual to test dict equality"Jenkins2015-10-271-1/+1
|\ \ | |/
| * Use assertDictEqual to test dict equalityMonty Taylor2015-10-271-1/+1
| | | | | | | | | | | | | | | | Just using equals is not a consistent test, because dict ordering can change. assertDictEqual tests that the contents of the two dicts are the same. Change-Id: I1b084a3fee91d73d57a6b9e6a2d0ab9c186e5572
* | Always pull regions from vendor profilesMonty Taylor2015-10-261-10/+22
|/ | | | | | | | | Regions are special, since they're a driver for creating a cloud config object in the first place. We weren't syncing them from the vendor profile, so if the region wasn't set in the clouds.yaml, region name validation (and get_all_clouds) would fail. Change-Id: I5b8d6807a86b87a7f69f523f2fee2784389fab0a
* Clean up cache interface, add support for services1.9.0Monty Taylor2015-10-173-14/+59
| | | | | | | | | | | | | | | We just added an unreleased interface method to the CloudConfig object - but maybe that should have been more aligned with dogpile words. SO - change the docs to reference the dogpile words and add support for that, while keeping backwards compat support for people using max_age. Also, do the -/_ transform on the cache config like elsewhere. Then, while we're in there, add support for per-service cache timings. We need this in nodepool and shade is adding support, so ability to configure it will be important. Change-Id: I31190a31ab0b79fc080db3611c0cd584076387d4
* Merge "Add Rackspace LON region"Jenkins2015-10-162-2/+4
|\
View Lorry Controller Status