summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "Fix FLAGS.volumes_dir help message"Jenkins2012-09-132-4/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix FLAGS.volumes_dir help messageJoe Gordon2012-09-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And other nova/volume/iscsi.py typos Change-Id: I08e7d4379f6a455273df999b621f8a89e73e0aef
* | | | | | | | | | Merge "Avoid live migrate overwriting the other task_state"Jenkins2012-09-135-22/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Avoid live migrate overwriting the other task_stateJian Wen2012-09-135-22/+29
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As commit 4082c8375a6ae7e7e67c7ad2e263be2d5fc3dd1f says, one ordinary task is running, so that task_state is set. The live_migrate task is accepted at API, and will change task_state to MIGRATING. However the first task may continue to update task_state or set it to None as it finishes. This patch avoids it by updating task_state in compute.api.live_migrate level with expected_task_state=None. Add test case for compute.api.live_migrate. Fixes bug 1049533 Change-Id: Ida8cef4797de421a7e356c9f5e882fe926535639
* | | | | | | | | Merge "Adds more servers list and servers details samples"Jenkins2012-09-1321-24/+315
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds more servers list and servers details samplesVishvananda Ishaya2012-09-1221-24/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the servers detail test into the base servers test so it runs with all_extensions as well. It also renames the results to be consistent with the other tests. Finally it adds test for servers-list both with and without extensions. Change-Id: I6eed3932fa594f1a39faa55453461680781e6a9f
* | | | | | | | | | Merge "fix rpcapi version."Jenkins2012-09-136-4/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix rpcapi version.Russell Bryant2012-09-116-4/+53
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ce4dbbd7, the BASE_RPC_API_VERSION was changed to '2.1' in nova.compute.rpcapi. This should remain '2.0' until the API goes to 3.X. Only specify version '2.1' for the method that requires it (rebuild_instance). Add a NOTE above each instance of BASE_RPC_API_VERSION to try to help clarify this for the future. Change-Id: I06cef44c905e8966505d5fb5b1046d6a0c75d533
* | | | | | | | | | Merge "Add flag cinder_endpoint_template to volume.cinder"Jenkins2012-09-134-7/+180
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add flag cinder_endpoint_template to volume.cinderClay Gerrard2012-09-104-7/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add optional flag to allow cinder endpoint to be defined by flag rather than extracted from the request context's service catalog. No change to default behavior. This flag allows deployers to use a seperate management endpoint for cinder which compute can use exclusively to send messages to cinder, or just use an auth system that doesn't add/forward the catalog along with the request (e.g. noauth). Add python-cinderclient to tools/test-requires fix lp bug #1048798 Change-Id: Icb416bf4df2a6e37024f1fbc866006d46d30bcf2
* | | | | | | | | | | Merge "More specific lxml versions in tools/pip-requires"Jenkins2012-09-132-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | More specific lxml versions in tools/pip-requiresAndrew Laski2012-09-102-4/+4
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed lxml version in tools/pip-requires from >=2.3,<3 to >=2.3,<2.3.5. pip was apparently accepting 3.0alpha as a <3 requirement but the ordering of elements changes in that version. Some of the libvirt tests would pass with lxml 3.0alpha but fail with any 2.3.x version. The tests now pass with any version of lxml within the range specified. Change-Id: I2d84d32f1bf6fba2c6dbe05799a284a44d4c39d8
* | | | | | | | | | | Merge "Update SolidFire volume driver"Jenkins2012-09-133-312/+516
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update SolidFire volume driverJohn Griffith2012-09-093-312/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements blueprint update-solidfire-driver * Updates driver to reflect changes in the release version of SF API * Modify SF naming scheme * Implement snapshot functionality * Implement setting qos on create via metadata * Update/Add tests (cherry picked from cinder commit df5c4ba) Change-Id: I08f7aac31e9d95f971d297a19c285dfa7151b931
* | | | | | | | | | | | Merge "Stop fetch_ca from throwing IOError exceptions"Jenkins2012-09-133-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Stop fetch_ca from throwing IOError exceptionsChris Yeoh2012-09-123-3/+41
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #883300 Fixes problem where fetch_ca could throw an IOError exception rather than a Nova specific exception. Adds FileError exception. Fixes other functions in crypto.py that had very similar problems. Change-Id: Ic2e43c35ad58c67d33156c53d2a41910dfdf8678
* | | | | | | | | | | | Merge "Adds API sample test for Flavors Extra Data extension."Jenkins2012-09-1217-0/+418
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adds API sample test for Flavors Extra Data extension.Tiago Mello2012-09-1017-0/+418
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65f8ed10dc5c1d31f848ad3fdc5c63e17fdc518f
* | | | | | | | | | | | Merge "Fix flavor deletion when there is a deleted flavor"Jenkins2012-09-122-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix flavor deletion when there is a deleted flavorVishvananda Ishaya2012-09-102-3/+7
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a deleted flavor with the same ID as an undeleted flavor, the flavormanage delete code attempts to delete it again, which fails. This patch makes sure to pass read_deleted='no' when the flavor is retrieved for deletion so we get the undeleted flavor. Includes a failing test to make sure the value is passed properly. Fixes bug 1048678 Change-Id: If6a20de2526b7ba90ada4a40317a98f79b2141dc
* | | | | | | | | | | | Merge "Add 'detaching' to volume status"Jenkins2012-09-127-3/+52
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add 'detaching' to volume statusRongze Zhu2012-09-127-3/+52
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1004382 When attach a volume , the volume status is "available -> attaching -> in-use", But when detaching a volume , the volume status is "in-use -> available". So We need 'detaching' volume status, it make the change of state of the volume more clearly. Change-Id: I544220c206899307294d50e26679f5351fdc0cd7
* | | | | | | | | | | | Merge "Rename _unplug_vifs to unplug_vifs"Jenkins2012-09-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rename _unplug_vifs to unplug_vifsYun Mao2012-09-121-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self._vmops is of type VMWareVMOps, which doesn't have unplug_vifs defined. Partially fix bug 1037183 Change-Id: I561788fbfea1d221e13850e93593f8b9a96d9f7c
* | | | | | | | | | | | Merge "Check flavor id on resize."Jenkins2012-09-124-11/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Check flavor id on resize.Alessandro Tagliapietra2012-09-124-11/+8
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually it checks for memory size changes so you can't change just cpu or hdd when resizing instances. Fixes bug 1049195 Change-Id: I793d19dbf5f1d89d365e63ab61b4edb983fdb11c
* | | | | | | | | | | | Merge "Makes key_name show in details view of servers"Jenkins2012-09-122-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Makes key_name show in details view of serversVishvananda Ishaya2012-09-122-4/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrong authorizor was being used in the details view and the test for details was broken. This fixes the test and makes sure that key_name shows up in details like it is supposed to. Fixes bug 1043584 Change-Id: I4ff01bbd32759f30e7a31ef2eac9f58922843037
* | | | | | | | | | | Merge "Change comment for function _destroy"Jenkins2012-09-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change comment for function _destroyxushichao2012-09-121-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'the instance if already' to 'the instance is already' Change-Id: I31bee8d7c3049d14442abffce4b48589af083544
* | | | | | | | | | | Merge "Avoid VM task state revert on instance termination"Jenkins2012-09-122-24/+62
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Avoid VM task state revert on instance terminationEoghan Glynn2012-09-122-24/+62
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to bug 1046236. Previously, if an exception is raised during the nova-compute node's instance termination logic *before* the instance is evicted from the DB (e.g. in the network teardown), then the task_state is reverted back to None by the reverts_task_state decorator, so the instance continues to be reported as ACTIVE with no outstanding task. A subsequent attempt to delete the same instance results in the quota_usages in_use count being decremented a second time. This occurs despite I91a70ada as that fix depends on the VM task state continuing to be DELETING. That logic was undermined in Id4358c50 which caused the task state to be reverted on the successful or unsuccessful conclusion of the action on the compute node. Now, the motivation for Id4358c50 was to avoid the VM getting stuck with a task state that prevents any further action other than deletion. However in the case of a deletion already having been requested, this protection is unnecessary and counter-productive. Hence we remove the task state reversion from the terminate_instance action. Change-Id: Ie5701e5c12f6241a203423d29d05df1858406c56
* | | | | | | | | | Merge "PowerVM: Establish SSH connection at use time"Jenkins2012-09-121-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | PowerVM: Establish SSH connection at use timeThierry Carrez2012-09-121-1/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Establish SSH connection at use time in PowerVM compute driver, in order to work around a paramiko error on slow networks. Patch based on a proposal by David Peraza. Fixes bug 1040785. Change-Id: I1a656981fae2f384c748c077d608018a0aafb681
* | | | | | | | | | Merge "libvirt: Fix live block migration"Jenkins2012-09-123-69/+79
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | libvirt: Fix live block migrationJian Wen2012-09-123-69/+79
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current check_can_live_migrate_destination trys to get instance info by call self._conn.lookupByName(instance_name) on the destination host before migrating. Because the instance is not on the destination host yet, it failes with InstanceNotFound. This fix gets the available disk size of the destination side. On the source side, checks whether the above space is enough before migrating. Fixes bug 1044237 Change-Id: I20f64e1f85828049b697a4b1173bac8e5779d45a
* / / / / / / / / / Reset task state before reschedulingBrian Elliott2012-09-122-0/+10
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset the task state to SCHEDULING before attempting re-scheduling. This is a precaution to make sure subsequent calls to update the task state see an 'expected_task_state'. bug 1049897 Change-Id: I5667a88487bd7039eb2e0aaebef532199d8b31ef
* | | | | | | | | Merge "Fix xml metadata for volumes api in nova-volume."Jenkins2012-09-112-9/+181
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix xml metadata for volumes api in nova-volume.Matthew Treinish2012-09-042-9/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1040891 Change-Id: I6295e4084adc33999bfdf66728623b278895b2d6 Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>
* | | | | | | | | Merge "Remove unused AddressAlreadyAllocated exception"Jenkins2012-09-111-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused AddressAlreadyAllocated exceptionMark McLoughlin2012-09-111-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coincidentally, unused for two years now since commit 2f3a63ac Change-Id: I2112c7686ef22116e777e397d4fc2c1bbbb1ad58
* | | | | | | | | | Merge "Remove an unused import"Jenkins2012-09-111-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove an unused importxushichao2012-09-111-1/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the nova.virt.driver import because it is not used Change-Id: I6f9a0bd5593497d8e1af4dec9361064a374a00fb
* / / / / / / / / / Convert to ints in VlanManager.create_networksVishvananda Ishaya2012-09-111-10/+16
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1046778 Change-Id: I17647b0e495964c305e54221bf3fcfd6bdbc1547
* | | | | | | | | Merge "Handle missing network_size in nova-manage"Jenkins2012-09-111-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle missing network_size in nova-manageJoe Gordon2012-09-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 'nova-manage network create' --network_size should be optional. Fixes bug 1046605 Change-Id: I25ce9acbe664810aa8fe9a3b4a2951c0fac4e41a
* | | | | | | | | | Merge "Prevent Partial terminations in EC2"Jenkins2012-09-111-18/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent Partial terminations in EC2Joe Gordon2012-09-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing in a valid and an invalid EC2 id, the API should not partially execute the command, and instead just return an error. Fix bug 979336 Also prevents partial: * starts * stops * reboots Change-Id: I28fb4f34aadfb7af14774db983d44584e61c5414
* | | | | | | | | | | Make ip block splitting a bit more self documenting.Michael Still2012-09-111-3/+3
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1343850d75707bc189ba11b33491361f7f58e29
* | | | | | | | | | Merge "Improve floating IP delete speed."Jenkins2012-09-113-9/+42
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |