summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fall back to keystoneclient arg processing"1.7.3Jenkins2015-09-181-6/+74
|\
| * Fall back to keystoneclient arg processingMonty Taylor2015-09-181-6/+74
| | | | | | | | | | | | | | For things not on keystoneauth yet, we need to move things into the auth dict using keystoneclient. Change-Id: Ia4500cc270b775f189048ccf667d5bfdc5dfcd14
* | Fix typo in ovh region namesJames E. Blair2015-09-181-2/+2
|/ | | | Change-Id: If8dee92917d1f5c1e349f02eba7661c39dbe7d0b
* Move plugin loader creation to try block1.7.2Monty Taylor2015-09-181-1/+1
| | | | | | | | We only need the plugin loader if we're going to create an auth plugin. Doing this when validate=False is clearly not a workable solution, because we'll wind up validating unknown plugins. Change-Id: Ieed44aa3ef41a14edd7529ca599a01967d517207
* Merge "Convert auth kwargs '-' to '_'"1.7.1Jenkins2015-09-172-0/+20
|\
| * Convert auth kwargs '-' to '_'Gregory Haynes2015-09-162-0/+20
| | | | | | | | | | | | | | When passing in kwargs to _get_one_cloud we do not dive into the auth dict to convert '-' to '_'. Change-Id: I8ce12370b5fd4444ba17d724e7f8036a7b0d2784
* | Properly handle os- prefixed args in fix_argsClark Boylan2015-09-161-1/+1
|/ | | | | | | | | | Prior to this any arg that started with 'os' had the 'os' prefix chomped including the next character. This meant that any arg like 'osmosis' would've been replaced with 'osis' which is clearly wrong. Instead we want to treat the OpenStack prefix of 'os-' or 'os_' as the special thing so check the next character is correct before chomping. Change-Id: Id12a92adf63d896f7aa5c0e391abd299c4ce3331
* Merge "Add internap to the vendor list"1.7.0Jenkins2015-09-162-0/+26
|\
| * Add internap to the vendor listMonty Taylor2015-09-162-0/+26
| | | | | | | | Change-Id: I4c98b72f039fd97a2c55ecbfa546fb908d1fe539
* | Allow configuring domain id onceMonty Taylor2015-09-163-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the most common case, a use has one and only one domain id that they care about, and it's associated with their user and project. Instead of making them set it for both user_domain_id and project_domain_id, allow for domain_{id, name} and then fill in any missing values for {user,project}_domain_{id,name} with the given value. This is mainly because I wind up with config files looking like this: user_domain_id: d0919bd5e8d74e49adf0e145807ffc38 project_domain_id: d0919bd5e8d74e49adf0e145807ffc38 Which offends my tender sensibilities. Change-Id: I12342dfa9f1b539a3fea5dd8874c42d027c59739
* | Fix typo in comment - we use ksa not kscMonty Taylor2015-09-161-1/+1
| | | | | | | | Change-Id: I9f35c26fc633b07442141443574ea9b7582036be
* | Defer plugin validation to keystoneauthMonty Taylor2015-09-164-57/+54
| | | | | | | | | | | | | | | | | | | | keystoneauth plugin loading has parameter validation itself. Rather than us doing it, let ksa do it. This bubbles up a ksa exception- but I think I'm ok with that as an interface. Change-Id: I3e7741a1b623b133f24f321e97539883dc6cd153
* | Merge "Return keystoneauth plugins based on auth args"Jenkins2015-09-162-0/+17
|\ \ | |/ |/|
| * Return keystoneauth plugins based on auth argsMonty Taylor2015-09-152-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | We know all of the things that we need to know to return an appropriate auth plugin from keystoneauth based on the auth parameters. This also introduces a hard-depend on keystoneauth, which should be fine since keystoneauth itself has a very low dependency count. We'll also use ksa to help validate auth parameters when we're doing the config processing. Change-Id: Ia1a1a4adb4dcefed5d7607082e026ca7361f394d
* | Remove an extra line1.6.4Monty Taylor2015-09-151-1/+0
| | | | | | | | Change-Id: I3a7f31a205b9a49e8c93f71e2a9dacacee6e2f91
* | Add Datacentred to the vendor listMonty Taylor2015-09-152-1/+20
| | | | | | | | Change-Id: Iac2a51f2351e6b46469508abadd63942829663f0
* | Add ultimum to list of vendorsMonty Taylor2015-09-152-0/+16
| | | | | | | | Change-Id: Ic5b5ee307b9d1eb338839a7feeeab50469316cf5
* | Add Enter Cloud Suite to vendors listMonty Taylor2015-09-152-0/+21
| | | | | | | | Change-Id: I78e9191073e68a9d3f78ba11b47aa0b1ff816430
* | Add elastx to vendor support matrixMonty Taylor2015-09-152-0/+18
| | | | | | | | Change-Id: I67973f89e2da4ef550e46c32ad63a4c8e043b4d0
* | Switch the image default to v2Monty Taylor2015-09-158-15/+4
| | | | | | | | | | | | | | It turns out it's more common than v1. Also, ovh was inappropriately listing glance v1. Change-Id: Icb534bf98fd3fa1c900ed9e4dd09ea0643176ff9
* | Update auro auth_url and region informationMonty Taylor2015-09-152-3/+5
| | | | | | | | | | | | Also, turns out auro is running Glance v2. Change-Id: Iccc2e09f45192ac21001c346dab048c77a0f7813
* | Add citycloud to the vendors listMonty Taylor2015-09-152-0/+26
| | | | | | | | | | | | Nice job with keystone v3 support. Change-Id: Ib2b54feef5055b04740a63a3a1d4e0b967018864
* | Remove duplicate lines that are the same as defaultMonty Taylor2015-09-151-2/+0
| | | | | | | | Change-Id: I007802ac08a8708fbbbfa8ee8c7d79e4e2bb55f7
* | Add default version number for heatMonty Taylor2015-09-131-0/+1
|/ | | | | | Heat only has v1. Change-Id: I31b40b7cfec0685105b8066d1cb385befae00f90
* Merge "Handle empty defaults.yaml file"Jenkins2015-09-071-1/+3
|\
| * Handle empty defaults.yaml fileEric Harney2015-09-031-1/+3
| | | | | | | | | | | | | | If defaults.yaml is empty, a TypeError is thrown because the result of yaml.load is not iterable. Change-Id: Ic3283ebaf9dd325e4f430e70bce08c6d716f60bc
* | Update OVH public cloud informationMonty Taylor2015-09-042-1/+5
|/ | | | | | | OVH has two regions now. Also, be clear that OVH does not use floating ips. Change-Id: Iabd84748cccec7da6e083b647511cba48d57bc20
* Do not treat project_name and project_id the sameMonty Taylor2015-08-183-6/+10
| | | | | | There are clouds where doing this is not working. Change-Id: I1d2e71b2a6ad22eb5070b92448779f2e9df71e4a
* Merge "Revert "Revert "Use the correct auth_plugin for token authentication"""Jenkins2015-08-171-2/+6
|\
| * Revert "Revert "Use the correct auth_plugin for token authentication""Monty Taylor2015-08-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Name the auth type needed for using an admin token "admin_token". This hack can be removed with keystoneclient and/or keystoneauth make a release with the admin_token entrypoint defined. Naming it admin_token further reduces the conflict with OSC, which should make the patch to work around OSC having different arguments unnecessary. This reverts commit 0e3117cb01d201f403be72cbb1218b9eec69a541. Change-Id: I079c7c61b2637ded73542876cb1378a0731f8631
* | Merge "Revert "Use the correct auth_plugin for token authentication""1.6.3Jenkins2015-08-131-6/+2
|\ \ | |/
| * Revert "Use the correct auth_plugin for token authentication"lifeless2015-08-131-6/+2
| | | | | | | | | | | | | | | | This reverts commit dfef01a7cbb9d68ad443d182e548ec58143a3a1f. This broke the world. Change-Id: I65d820b0da807a161eae814ea4b5413f245d7bf0
* | Merge "Use the correct auth_plugin for token authentication"1.6.2Jenkins2015-08-131-2/+6
|\ \ | |/
| * Use the correct auth_plugin for token authenticationDavide Guerri2015-08-111-2/+6
| | | | | | | | | | | | | | Use ksc_auth.token_endpoint.Token as Keystone authentication plugin if auth_type is token_endpoint. Change-Id: I1a6d6dfe731527d7040cfbc2404fd5cf86ba5893
* | Ignore infra CI env varsDavid Shrewsbury2015-08-121-1/+5
|/ | | | | | | | | | | | When running tests in the infra CI system, some OS_ environment variables are defined (e.g., OS_TEST_TIMEOUT, OS_TEST_PATH, OS_STDERR_CAPTURE, OS_STDOUT_CAPTURE) and this makes o-c-c think that we are using environment variables for an envvar cloud. In some rare cases, this can cause tests to fail if they expect cloud definitions to come only from clouds.yaml. This change ignores these CI variables. Change-Id: I6458969b45f5534e1172b9f8ba598d7c536a59b5
* Align to generic password auth-type1.6.1Monty Taylor2015-08-011-0/+6
| | | | | | | | v2password can't handle v3 parameter names. But we align to those for sanity. Ensure that a user gets the v2plugin that can handle the auth instead of the one that can't. Change-Id: Ie693e613fd5d0e20a4837923300502b1de02364b
* Merge "Clarify floating ip use for vendors"1.6.0Jenkins2015-07-271-2/+3
|\
| * Clarify floating ip use for vendorsMonty Taylor2015-07-271-2/+3
| | | | | | | | | | | | | | | | HP was not listed as needing a floating ip. Also, the non-floating IP case mentions direct routing, so amend the floating IP case to mention NAT for completeness and clarity. Change-Id: I220c41f6c822b7b6ffb1ec11038749153ef5a6ee
* | Add per-service endpoint overridesMonty Taylor2015-07-272-0/+9
|/ | | | | | | Make it possible to override a service's endpoint like service_type and service_name. This is already documented as working. Change-Id: I8764ed68f8a38563c4242d4b50e2158e99ed4109
* Merge "Remove requirements.txt from tox.ini"1.5.0Jenkins2015-07-271-2/+1
|\
| * Remove requirements.txt from tox.iniTerryHowe2015-07-171-2/+1
| | | | | | | | | | | | | | From lifeless: pbr reflects the package dependencies from requirements.txt into the sdist that tox builds. Change-Id: Iaa6026a504cc53784aad5731e9afe8b684b3ede5
* | Merge "Remove region list from single cloud"Jenkins2015-07-201-0/+4
|\ \ | |/ |/|
| * Remove region list from single cloudMonty Taylor2015-07-161-0/+4
| | | | | | | | | | | | | | | | | | regions is a list of regions that can be used to create more than one CloudConfig object for each cloud/region combo. The regions field itself makes no sense to set on each of those CloudConfigs, so do not pass it through. Change-Id: I76b3bb3bc4778223d72f86d01d02ce150651b3b9
* | Merge "Rename 'endpoint_type' to 'interface'"Jenkins2015-07-175-10/+40
|\ \
| * | Rename 'endpoint_type' to 'interface'TerryHowe2015-07-165-10/+40
| | | | | | | | | | | | | | | | | | | | | The keystone folks seem to feel that interface is a better name than endpoint type. Change-Id: Ibfc54e725b6dae843c07f7786f51f9fb9141c983
* | | Merge "Have service name default to None"Jenkins2015-07-172-1/+30
|\ \ \ | |/ /
| * | Have service name default to NoneTerryHowe2015-07-162-1/+30
| | | | | | | | | | | | | | | | | | | | | It seems like having service name default to service_type would not work in a lot of situations. Change-Id: Ia70242fad346c1681fa4abca9d604aea3ae002dd
* | | Remove py26 and py33 from tox.iniTerryHowe2015-07-161-1/+1
|/ / | | | | | | Change-Id: I79a9dceffc0432398bda70949db2e523cbbff515
* | Fix set_default() when used before config initDavid Shrewsbury2015-07-142-1/+23
| | | | | | | | | | | | | | | | | | | | Using set_default() before initializing OpenStackConfig would cause an error since the _defaults dict would still be None and not an actual dict. This corrects that by calling get_defaults() to make sure it is initialized properly, and also adds a warning to note that the method is now deprecated. Change-Id: I81803c680b614f9bee47c6f69a4efffa638dcebc
* | Merge "Specify the config file with environment variable"Jenkins2015-07-113-0/+17
|\ \
View Lorry Controller Status