summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Add MultipleCreate template and fix conflict with other templates"Jenkins2013-03-094-15/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add MultipleCreate template and fix conflict with other templatesMauro S. M. Rodrigues2013-03-074-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch creates a dedicated xml template to the os-multiple-create extension when using return_reservation_id=True in the request. The previous code, with all extensions loaded, conflicted with security_groups extension. There is also a change in the response due to the new Template, but the only information removed is an empty metadata field (which made the previous xml output even more inconsisten with json). The consistency between json and xml will be treated in the next api version. DocImpact Fixes bug 1149526 Change-Id: I3ca0129086ff1df3a8faa2b3b8bd959c9b74103c
* | | | | | | | | | | | Merge "add .idea folder to .gitignore pycharm creates this folder"Jenkins2013-03-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add .idea folder to .gitignore pycharm creates this folderkashivreddy2013-03-071-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbeabe1d3e102d9e447f46be96280e61aa364b74
* | | | | | | | | | | | Merge "Fix Wrong syntax for set:tag in dnsmasq startup option"Jenkins2013-03-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Wrong syntax for set:tag in dnsmasq startup optionDavanum Srinivas2013-03-082-2/+2
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the introduction of quotes in fix for previous bug 1012443 was erroneous. Fixes LP# 1152504 Change-Id: Ic84739e38e3b3567f1617302a33623de03196f85
* | | | | | | | | | | | Merge "Fix instance evacuate with shared storage"Jenkins2013-03-092-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix instance evacuate with shared storageKravchenko Pavel2013-03-082-0/+27
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes instance evacuation problem when --on-shared-storage flag specified. The problem occurs as the password variable ends up being accessed before it is assigned. Also adds missing test case. Fixes bug 1152492 Change-Id: I461c0f7fcf8835028f7529a7860fb330d1759d68
* | | | | | | | | | | | Merge "Nova network needs to take care of existing alias"Jenkins2013-03-091-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Nova network needs to take care of existing aliasÉdouard Thuleau2013-02-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nova network should take care of existing aliases on bridge interfaces when it adds address on top of the list. Change-Id: Ife54c9eba64906406f7c44a66b596f3162ad16b6 Fixes: bug #1077066
* | | | | | | | | | | | | Merge "Correct substring matching of baremetal VPD node names"Jenkins2013-03-093-15/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Correct substring matching of baremetal VPD node namesChris Krelle2013-03-083-15/+30
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This path corrects a issue where is_power_on function can incorrectly match a node if its name is a substring of another node. I have also added a test for this. fixes bug 1152676 Change-Id: Ic3b0b952d53dcd4464098f98879a84684efe22b2 Authored-by: Chris Krelle <nobodycam@gmail.com>
* | | | | | | | | | | | | Prevent rescue for volume-backed instancesNikola Dipanov2013-03-095-12/+70
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prevents rescuing of volume_backed instances, by checking for it in the API layer and raising an exception if instance on which a rescue was attempted is volume backed. Rescue is supposed to just be a way to log into a wayward instance if something goes wrong with the base image that may have had some data (logfiles etc.) and make it possible to grab that - block devices are assumed to be accessible by re-attaching them, and are considered persistant so no need for rescue there. Fixes bug: #1067744 blueprint: improve-boot-from-volume Change-Id: I8a4b1ccff7406837de3086aa413034e8e647b8fa
* | | | | | | | | | | | Merge "Fix ephemeral devices on LVM don't get mkfs'd"Jenkins2013-03-094-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix ephemeral devices on LVM don't get mkfs'dRafi Khardalian2013-03-014-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1083424 Updated imagebackend to run the necessary callback conditionally based on whether LVM is configured for use and ephemeral_size is defined. The callback function was updated not to invoke qemu-img for LVM, since the ephemeral disk is already present/created via LVM. Lastly, the mkfs call had to be changed to be run as root, since we are dealing with raw devices. Change-Id: Ieb1febb0ea086f8e5063d92ca376d349fcd43a43
* | | | | | | | | | | | | Merge "Fix Network object encoding issue when using qpid"Jenkins2013-03-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Network object encoding issue when using qpidzhhuabj2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating network via REST API will throw the exception "CodecException: no encoding for <nova.db.sqlalchemy.models.Network object at 0x4a8ea10>". It only occurs when using qpid. Fix this issue through using jsonutils.to_primitive method. Fix bug 1143584. Change-Id: I833aef451f8e3d5eaa246c19d67b2474a9d36910
* | | | | | | | | | | | | | Merge "Make 'os-hosts/node1' case sensitivity defer to DB"Jenkins2013-03-092-8/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Make 'os-hosts/node1' case sensitivity defer to DBJoe Gordon2013-03-072-8/+24
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPC is case sensitive, but URL is not, and DB can be. So pull host_name from DB in HostAPI RPC layer instead of from passed in from URL. This means RPC will always get the proper capitalization, and case sensitivity is defined in DB layer. Fix bug 996879 Change-Id: I448dd4ec3aec4af1adf4487f26ea996db572fa3d
* | | | | | | | | | | | | Merge "Fix for delete error in Hyper-V - missing CONF imports"Jenkins2013-03-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix for delete error in Hyper-V - missing CONF importsDavanum Srinivas2013-03-071-0/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like we need to import the options explicitly Fix for LP# 1140759 Change-Id: I21c09330c209f4e2178b6c0a6300944cd58d4423
* | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/scheduler"Jenkins2013-03-083-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/schedulerDan Smith2013-03-083-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a tiny change in the actual code, but requires a bunch of silly changes in the tests because we're so inconsistent with our (ab)use of instance types there. This attempts to help clean that up locally a bit. This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: Ied1a944a7c762129597d18ded61ce1632657f070
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/api"Jenkins2013-03-087-23/+62
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/apiDan Smith2013-03-087-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a test that attempted to delete the data from the instance['instance_type'] structure and confirm that the flavor can still be fetched. Since this data is no longer consulted in that action (and will be removed altogether soon), this test is removed. This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: I3ba56f9419aece5b9269a181264d09b117ecdb81
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/network"Jenkins2013-03-085-17/+43
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/networkDan Smith2013-03-085-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: I43c9e9b7d560d8803899360bd7142e393b793f3d
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from nova/compute"Jenkins2013-03-085-57/+29
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from nova/computeDan Smith2013-03-085-57/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that some tests were verifying things that can no longer fail, namely rebuilding instances who use flavors that have since been disabled. These tests are removed here. Also, this changes the order of a piece of logic in the resize/migrate path where before we would have ended up checking the instance type that we fetched from sys_meta to see if it was disabled (which makes no sense now). Reversing the check (to see if we're doing a resize or a migrate before checking the new flavor) eliminates the problem of the stashed type not having the 'disabled' attribute. This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: I214a693e3bb16c0a365eb9b3afe73601beba4a22
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from libvirt driver."Jenkins2013-03-084-9/+26
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove uses of instance['instance_type'] from libvirt driver.Dan Smith2013-03-064-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this includes a few tweaks to the libvirt tests where the instance type in use was expected to have no swap, but the actual id-matching fake did. This integration makes it a little harder for the tests to be out of whack like that, which is good. This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: I190258bd0947944d9bcdf49956eed40d402606f5
* | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from powervm driver."Jenkins2013-03-083-5/+13
|\| | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove uses of instance['instance_type'] from powervm driver.Dan Smith2013-03-063-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: I885a807d00f7f909665da6e7a3382295a43258c9
* | | | | | | | | | | | | Merge "Fix instance type cleanup when doing a same-id migration"Jenkins2013-03-082-7/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix instance type cleanup when doing a same-id migrationDan Smith2013-03-072-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we assumed that we were moving from one flavor to another during a migration (i.e. a resize). That assumption failed when a regular migration went to delete the old_ stashed instance types from system_metadata. This unifies the cleanup logic, which only gets performed if we're actually doing a resize. Fixes bug 1136768 Change-Id: I0796864b044fc746583164e4a684f79dc431c137
* | | | | | | | | | | | | | Merge "Add conductor to nova-all."Jenkins2013-03-081-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add conductor to nova-all.Rick Harris2013-03-081-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conductor service was missing so running nova-all no longer results in a complete environment. This patch adds conductor to the binary list and updates the code to handle the different way in which conductor specifies the topic and manager. Fixes bug 1152371 Change-Id: I4862ad66216ab980e8636e9f3cdbabbace6ee73c
* | | | | | | | | | | | | | | Merge "Rework instance actions to work with cells"Jenkins2013-03-0813-5/+297
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rework instance actions to work with cellsAndrew Laski2013-02-2513-5/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a cells setup an instance action is recorded at the global cell level while events try to get recorded in a child cell compute node or scheduler. The event recording fails because it can't find an action to link to. This patch adds the recording of actions at the child cell level, and changes the API extension to query the db in a child cell for the record of actions and events. This does not address the fact that an action is recorded at the global cell level. Bug 1132935 Change-Id: I5831f146397e7afa2d93d26c5d6f9abb9bc6670d
* | | | | | | | | | | | | | | | Merge "Make nova-manage db archive_deleted_rows more explicit"Jenkins2013-03-083-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make nova-manage db archive_deleted_rows more explicitJoe Gordon2013-03-083-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * max_rows must be positive Provide a better error message of 'nova-manage db archive_deleted_rows --max_rows=' is negative. * Requires a max_rows * No hidden default of 5000 Fix bug 1145609 Fix bug 1151064 Change-Id: I9078ff2700a0329ac4aff68bb434be5f16a5a3f1
* | | | | | | | | | | | | | | | Merge "Fixed image filter support for vmware"Jenkins2013-03-081-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed image filter support for vmwaredivakar-padiyar-nandavar2013-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vmware compute driver does not support the image filter based on hypervisor_type. In a heterogeneous environment, this filter attribute allows us to provision an instance to a specific hypervisor based on the property of the glance image. The solution is to populate the dictionary 'supported_instances' from the vmware compute driver. Fix for bug 1131542 Change-Id: I6ebf9f0d4a17b3083f66f69f077f910552d9a951
* | | | | | | | | | | | | | | | Fix access_ip_* raceChris Behrens2013-03-072-40/+55
| |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code currently sets access_ip_* in a 2nd DB call after an instance goes ACTIVE, which means there's a slight race when someone is querying the API for their instance. It's possible to see the instance ACTIVE but access_ip_* will be blank. To fix this, we should set access_ip_* at the same time the instance goes ACTIVE. This also removes an unnecessary extra DB call. Fixes bug 1152328 Change-Id: I0fe542d49fbc95f27a24f57f674264f8789bc527
* | | | | | | | | | | | | | | Merge "Add missing action_start if deleting resized inst."Jenkins2013-03-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add missing action_start if deleting resized inst.Dan Prince2013-03-051-0/+4
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to delete a resized instance Nova will automatically call confirm on the resized instance to help clean things up. With some of the recent action event changes in grizzly this code path was broken due to a missing record_action_start call on the confirm_resize operation. Fixes LP Bug #1147387. Change-Id: I23e84de8675c980656a71b71e34ffa0a0801f389
* | | | | | | | | | | | | | | Merge "Read baremetal images from extra_specs namespace."Jenkins2013-03-072-16/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Read baremetal images from extra_specs namespace.Devananda van der Veen2013-03-042-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Baremetal PXE driver should read deploy_kernel_id & deploy_ramdisk_id from the 'baremetal:' namespace within instance_type['extra_specs'] so that it doesn't conflict with ComputeCapabilitiesFilter any more. Fixes bug 1129485. Change-Id: I84b3acb2ed83dc2b1ff8f1a21ca1d95f7d25751a
* | | | | | | | | | | | | | | Merge "Update tox.ini to support RHEL 6.x."Jenkins2013-03-073-2/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update tox.ini to support RHEL 6.x.Dan Prince2013-03-073-2/+45
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support running unit tests on RHEL 6.x we need to patch eventlet with contrib/redhat-eventlet.patch. We already have support for this in the tools/install_venv_common.py but we need to make a couple changes to allow tox to consume this: 1) Sync in the latest intall_venv_common.py from oslo. This changes patch to use the -N option (ignore already applied patches) and makes it safe to call the patching function more than once. 2) Add a new patch_tox_venv.py script in tools. 3) Update tox.ini to call patch_tox_venv.py before it runs tests and coverage. Change-Id: I3e2b07c3f718e4aede5c5f231ff0cdb7721ec885