summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "libvirt: consider vcpu_pin_set when choosing NUMA cells"Jenkins2014-09-292-21/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | libvirt: consider vcpu_pin_set when choosing NUMA cellsNikola Dipanov2014-09-292-21/+50
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a single NUMA cell instance scheduled to a NUMA capable host, we do not account for cpu_pin_set when choosing viable cells for the given instance. meaning we could choose a NUMA cell that has no viable CPUs which we will try to pin to. This patch changes that behaviour and also adds a test to prevent a regression. We also fix up how some of the tests mock the random.choice method, because now we give it a list of sets (of cpus), but also because it is now easier to catch a regression since we actually use the passed value. Change-Id: I0d740170db52a4777924648683ac98de9cf4b3cf Closes-bug: 1372845
* | | | | | | | | | Merge "Fix "revertResize/confirmResize" for V2.1 API"Jenkins2014-09-297-19/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix "revertResize/confirmResize" for V2.1 APIGhanshyam2014-09-117-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "revertResize/confirmResize" server actions were missed for V2.1 API. This patch converts "revertResize/confirmResize" server action for V2.1 API The differences between v2 and v3 are described on the wiki page https://wiki.openstack.org/wiki/NovaAPIv2tov3. Change-Id: I24bdb5b28fafeb60ea7b4ff044b12a519498e592 Closes-Bug: #1367642
* | | | | | | | | | | Merge "Fallback to legacy live migration if config error"Jenkins2014-09-292-7/+89
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fallback to legacy live migration if config errorMatt Riedemann2014-09-252-7/+89
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ea7da5152cdca7ba674e2137c3899909995e2287 added a path to using migrateToURI2 for live migration if the version of libvirt used has the VIR_DOMAIN_XML_MIGRATABLE flag set. However, a bug in older versions of libvirt causes the live migration to fail because it's incorrectly validating the old and new domain xml's for ABI stability. Not all distros are running with the patched version of libvirt so add a check in place such that if we fail live migration on the new path with VIR_ERR_CONFIG_UNSUPPORTED, assume it's due to this issue and attempt the legacy migrateToURI call. Closes-Bug: #1362929 Related-Bug: #1279563 Change-Id: Ie82566121c2ed3a6d55919bc111358f4129cb404
* | | | | | | | | | Merge "Fixes missing ec2 api address disassociate error on failure"Jenkins2014-09-293-3/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixes missing ec2 api address disassociate error on failureChris Yeoh2014-09-263-3/+11
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ec2 api address disassociate so that the ec2 error InvalidAssociationID.NotFound is returned when it is passed an invalid association rather than returning success. Note this is slightly different than the original bug report but the type of failure has changed since the bug was originally filed. Change-Id: I10034a2fed62d4e93bc384aef3ff594b66e285f2 Closes-Bug: 1179816
* | | | | | | | | Merge "Fix test_create_instance_invalid_key_name"Jenkins2014-09-291-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix test_create_instance_invalid_key_nameKen'ichi Ohmichi2014-09-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In test_create_instance_invalid_key_name, there were the duplicated negative factors. One is nonexistent image-id, the other one is non- existent keypair. This patch removes nonexistent image-id for the test purpose. Change-Id: I90ff4e9ca0eeb149aa0db7be2d171561586724e9
* | | | | | | | | | Merge "Add plan for kilo blueprints: project priorities"Jenkins2014-09-291-0/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add plan for kilo blueprints: project prioritiesJoe Gordon2014-09-171-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the nova mid-cycle we agreed that while specs have made our blueprint process significantly better, we think the current approach still leaves much to be desired. This document is the outcome of the discussion at the mid-cycle on how we want to manage blueprints in Kilo. This proposal is being placed in devref, as we want to use gerrit's workflow (two core reviews, inline comments, revisions etc) and this is a document for developers. Introduce the idea of project priorities. Change-Id: I7075a130c01be22f3ee5315d4a65b8e524b5a1ad
* | | | | | | | | | | Merge "Add test for get_instance_disk_info to test_virt_drivers"Jenkins2014-09-292-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add test for get_instance_disk_info to test_virt_driversMatt Riedemann2014-08-182-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2bed16c89356554a193a111d268a9587709ed2f7 added get_instance_disk_info to the base ComputeDriver class but didn't add a test for it in test_virt_drivers, so it's added here. This also fixes the wrong method signature in the fake virt driver. Note that this wouldn't have found the problem for the hyperv or vmware drivers due to bug 1209421. Change-Id: I5765720d8c3e0a7962b493fa49359514f3136544 Related-Bug: #1358719
* | | | | | | | | | | | Merge "Updated from global requirements"Jenkins2014-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated from global requirementsOpenStack Proposal Bot2014-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib184ffa042aa85b52eede765d1eb94ede96f36fa
* | | | | | | | | | | | | Merge "Fix Typo in method name - parse_Dom"Jenkins2014-09-272-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Typo in method name - parse_DomDavanum Srinivas2014-09-262-1/+14
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silly typo Closes-Bug: #1374158 Change-Id: Icccfb1a606bc9e14188d9f5c5f5667e35f2cb413
* | | | | | | | | | | | | Merge "Fix 'os-interface' resource name for Nova V2.1"Jenkins2014-09-272-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix 'os-interface' resource name for Nova V2.1Ghanshyam2014-09-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V2 and V3 diff for this resource name is below- V2 - '/servers/os-interface' V3 - '/servers/os-attach-interfaces' V3 resource name needs to be changed to work that for V2.1 Change-Id: I37bd7cee7e8879b01a8aee739d74c2dd6e033dc4 Closes-Bug: #1368035
* | | | | | | | | | | | | | Merge "Give context to the warning in _sync_power_states"Jenkins2014-09-271-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Give context to the warning in _sync_power_statesMatt Riedemann2014-09-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Found x in the database and y on the hypervisor" warning in the logs doesn't give any context to what is happening when that is logged, this adds the context. Change-Id: I8800006508b2e18de657aa0a8d135bcd17cb89f1
* | | | | | | | | | | | | | | Merge "Log original error when attaching volume fails"Jenkins2014-09-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Log original error when attaching volume failsMatt Riedemann2014-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a race in the gate to attach an encrypted volume and the only thing we see in the logs is the DeviceIsBusy error which makes this hard to debug. This change logs the original error so we can dig deeper into the root cause. Related-Bug: #1348204 Change-Id: I7d0f2571e80a4e55133f823d2a04feaf4dddf2e5
* | | | | | | | | | | | | | | Merge "Fix SecurityGroupExists error when booting instances"Jenkins2014-09-272-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix SecurityGroupExists error when booting instancesRoman Podoliaka2014-09-252-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we properly handle the case when multiple threads check and create the default security group, if it hasn't existed yet. One thread will succeed and others will fail (we have a unique constraint in db to prevent a race condition), so just handle the exception to let instance boot proceed. Steps to reproduce: 1) install OpenStack with Rally using DevStack: https://github.com/stackforge/rally/tree/master/contrib/devstack 2) fetch the Rally task: http://boris-42.github.io/boot.yaml 3) run it rally -v task start boot.yaml Closes-Bug: #1370782 Change-Id: I414637a31b0b540fefa6c1314be6e973e2d4a178
* | | | | | | | | | | | | | | | Merge "Fix `confirmResize` action status code in V2"Jenkins2014-09-261-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix `confirmResize` action status code in V2Ghanshyam2014-09-121-2/+1
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In server`s action `confirmResize` status code in @wsgi.response decorator is set as 202 but this is overridden/ignored by return statement (return exc.HTTPNoContent()) which return 204 status code. This is very confusing and we should have expected status code in @wsgi.response decorator as consistence with other APIs. NOTE- There is no change in API return status code. API returns the same 204 return code as previously. Change-Id: Id8033fb8880306babebc14b319bce5b3b8798774 Closes-Bug: #1368597
* | | | | | | | | | | | | | | | Merge "VMware: Use vm_mode constants"Jenkins2014-09-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | VMware: Use vm_mode constantsMatthew Booth2014-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address missing changes for the vm_mode type from commit 8fcd1b2c73dad8e2a7b4d299da270934fd5328cc. Change-Id: Id03dc089af064969501ee2fc9d965a2028f901e4 Co-authored-by: Gary Kotton <gkotton@vmware.com>
* | | | | | | | | | | | | | | | | Merge "Retry on closing of luks encrypted volume in case device is busy"Jenkins2014-09-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Retry on closing of luks encrypted volume in case device is busyMatt Riedemann2014-09-261-1/+2
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're seeing races in the gate on detach of an encrypted volume where the device is busy so the detach fails, which causes the delete of the volume on the cinder side to fail because the volume is still in use and then Tempest times out waiting for the volume to be deleted. This simply adds a retry to close the encryption device. I use attempts=3 since that's what we use for lvremove. Closes-Bug: #1374458 Change-Id: Ia0667da7dee247ba8c3338b296244b2a71d1045d
* | | | | | | | | | | | | | | | | Merge "postgresql: use postgres db instead of template1"Jenkins2014-09-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | postgresql: use postgres db instead of template1Roman Podoliaka2014-09-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In PostgreSQL template1 database is kind of special, as all new databases are copied from it, when you do CREATE DATABASE. This implies a few restrictions: e.g. you can't have more than one active session to template1, if one of them tries to create a database. It will fail with: ERROR: source database "template1" is being accessed by other users Using of postgres database instead of template1 resolves this issue. Closes-Bug: #1355929 Change-Id: I8b1a36163984fbef6be66964456072d32da6a9d0
* | | | | | | | | | | | | | | | | | Merge "Increase sleeps in baremetal driver"Jenkins2014-09-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Increase sleeps in baremetal driverDerek Higgins2014-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current sleeps are not long enough in some cases, increasing them very simply makes the driver far more reliable. Change-Id: Ida5591f9e4d1eb61e229096d541a8285803efeb5 Closes-Bug: #1316350
* | | | | | | | | | | | | | | | | | | Merge "Undo changes to obj_make_compatible"Jenkins2014-09-266-18/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Undo changes to obj_make_compatibleVishvananda Ishaya2014-09-256-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7cdfdccf1bb936d559bd3e247094a817bb3c03f4 attempted to make the obj_make_compatible calls consistent, but it actually changed them the wrong way. This fixes them to unwrap nova_object.data and updates the test that was testing the reverse. Change-Id: I1a5db4e9817390ba3c2423d33387f780c890de64 Closes-Bug: #1373535
* | | | | | | | | | | | | | | | | | | Merge "VMware: Make DatastorePath hashable"Jenkins2014-09-262-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | VMware: Make DatastorePath hashableMatthew Booth2014-09-252-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make DatastorePath work properly when used as a key value in a dict or set. This change specifically enables a subsequent change in the fake driver, which stores DatastorePath objects in a set. However, it's probably a good idea in general as I spent quite some time trying to work out why it didn't work when I hit it. Change-Id: Ia5519b84bc47ea1e0a5a70f9368806f762d12db5
* | | | | | | | | | | | | | | | | | | | Merge "VMware: trivial formatting fix in fake driver"Jenkins2014-09-261-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | VMware: trivial formatting fix in fake driverMatthew Booth2014-09-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6029896edb51c613bd53b5441df4825588b2334
* | | | | | | | | | | | | | | | | | | | Merge "VMware: Improve logging of DatastorePath in error messages"Jenkins2014-09-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | VMware: Improve logging of DatastorePath in error messagesMatthew Booth2014-09-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ad6dc52c460d11f71c750e8cc287b36d8238106
* | | | | | | | | | | | | | | | | | | | Merge "VMware: fix broken mock of ds_util.mkdir"Jenkins2014-09-261-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | VMware: fix broken mock of ds_util.mkdirMatthew Booth2014-09-181-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I788e33dbcb3dedc41831b976137607274b1c02ca introduced an incorrect use of mock which had side-effects for other tests. This change fixes it. Change-Id: I71188ec7c12d51c2b4a253f13a5f51cc8bc0ae36
* | | | | | | | | | | | | | | | | | | | Merge "Remove usage of self.__dict__ for message var replacement"Jenkins2014-09-263-15/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove usage of self.__dict__ for message var replacementMatt Riedemann2014-09-253-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the same as using locals() for variable replacement in a log message which violates hacking rule H501. On Cinder this actually caused the cinder-api process to hang on python 2.6. Nova has the same code so this fixes the hacking violation. Note that the H501 rule was updated in commit 55e96ee but it's not in a released version of hacking yet (and won't be in time for Juno). Closes-Bug: #1365901 Change-Id: I1be0db327a2fa1e866328eecd2e7c3dd3ee3cc93
* | | | | | | | | | | | | | | | | | | | | Merge "Add plan for kilo blueprints: when is a blueprint needed"Jenkins2014-09-262-0/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add plan for kilo blueprints: when is a blueprint neededJoe Gordon2014-09-122-0/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the nova mid-cycle we agreed that while specs have made our process significantly better, we think the current approach still leaves much to be desired. This document is the outcome of the discussion at the mid-cycle on how we want to manage blueprints in kilo. This proposal is being placed in devref, as we want to use gerrit's workflow (two core reviews, inline comments, revisions etc) and this is a document for developers. It turns out adding the specs requirement to blueprints adds a non-trivial amount of overhead, revisit when a blueprint and spec is needed to minimize overhead in cases where it isn't helpful. Change-Id: Iaaadc26f3f51ee091419beaa12e0508623eed99e