summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Use cPickle and not just pickle.Alex Meade2012-03-125-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 953423 cPickle is up to 1000 times faster than pickle. We should use it instead. Change-Id: I1facbdcf60d88c9fba56687abf75524498d2502e
* | | | | | | | | Merge "Move (cast|call)_compute_message methods back into compute API class"Jenkins2012-03-122-113/+106
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Move (cast|call)_compute_message methods back into compute API classChris Behrens2012-03-122-113/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those calls need to be able to be overridden in a subclass to support compute cells, at least initially. A prior patch that moved them to module functions broke the cells work. Change-Id: I6c35fa1ac646fe686bbc2c5eed2da7e286d32a15
* | | | | | | | | Merge "doc/source/conf.py: Fix man page building"Jenkins2012-03-122-227/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc/source/conf.py: Fix man page buildingAdam Gandelman2012-03-122-227/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 29df6cd70 renamed novamanage to nova-manage but did not update doc/source/conf.py accordingly causing build_sphinx failures. Also removes a stale conf.py backup created some time ago Change-Id: Ia00b6d88eab90e0e77992375d7ccc7036c9d5f34
* | | | | | | | | Merge "Fix libvirt get_console_output for Python < 2.7"Jenkins2012-03-121-10/+31
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix libvirt get_console_output for Python < 2.7Chris Behrens2012-03-121-10/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 953410 Unit tests fail when using Python 2.6. This fixes it. Change-Id: Ic53d16a75f5e4e134a92f27597a77404dd78d0f6
* | | | | | | | Merge "Avoid nova-manage floating create <IP addr>/32"Jenkins2012-03-121-12/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Avoid nova-manage floating create <IP addr>/32Eoghan Glynn2012-03-121-12/+10
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 951161 Avoid the counter-intuitive use of the /32 range to indicate a specific individial IP address. Instead a floating IP for a specific individual address is created by dropping the range specifier altogether, e.g.: nova-manage floating create 192.168.1.150 Change-Id: I54b124e961accefa47f6faa7f201809c545c3fa5
* | | | | | | Merge "improve speed of metadata"Jenkins2012-03-127-75/+171
|\ \ \ \ \ \ \
| * | | | | | | improve speed of metadataJesse Andrews2012-03-127-75/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * don't load every possible answer, only do what is needed * cache instance data for a given address for a 15 seconds using either memcache or fake memcache (in-memory). This means only a single queue/db lookup for multiple calls to metadata service * add cache expirey to fake memcache (don't grow forever) and move it to nova.common.memorycache Addresses Bug #851159 Change-Id: Icf794156e055b18915b8b5be9ba2ab97d2338bbe
* | | | | | | | Merge "Update floating auto assignment to use the model"Jenkins2012-03-123-5/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | Update floating auto assignment to use the modelJohn Griffith2012-03-123-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * addresses bug 928819 * previously submitted changes (#change,4236) * unit tests added that don't use fakes for everything * added testAssert to check assignment process * added call to deallocate as well Change-Id: I46503e6e88031a6e1ab3ac76163402091168c6b0
* | | | | | | | | Merge "Make nova-manage syslog check /var/log/messages."Jenkins2012-03-121-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make nova-manage syslog check /var/log/messages.Dan Prince2012-03-121-1/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates nova-manage syslog so that it checks /var/log/messages. Fixes LP Bug #953354. Change-Id: I0b4b61225285e9f0668f6f0af3928896e2700840
* | | | | | | | | Merge "Make snapshots with qemu-img instead of libvirt"Jenkins2012-03-125-31/+74
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Make snapshots with qemu-img instead of libvirtVishvananda Ishaya2012-03-095-31/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * snapshot is only supposed to snapshot the root drive, whereas libvirt snapshots snapshot the memory and all attached disks * removes silly qemu_img flag * fixes bug 946830 Change-Id: I6afc9dbaa855f06864cd5a37f89ad63555e35d23
* | | | | | | | | Merge "fix up nova-manage man page"Jenkins2012-03-121-3/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix up nova-manage man pageJoe Gordon2012-03-081-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If78542faef536b9897f771a091f096745b3ece8a
* | | | | | | | | | Merge "Change default of running_deleted_instance_action"Jenkins2012-03-122-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change default of running_deleted_instance_actionPhilip Knouff2012-03-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug #944997 Change-Id: I3baea3a05c23b8869e4a4d13d4a31fdc67793f0f
* | | | | | | | | | Merge "Bug #922356 QuantumManager does not initiate unplug on the linux_net ↵Jenkins2012-03-122-0/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | driver"
| * | | | | | | | | | Bug #922356 QuantumManager does not initiate unplug on the linux_net driverSumit Naiksatam2012-03-092-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove_gateway() being added to L3 driver API which gets invoked from QuantumManager when a network is deleted. remove_gateway() implementation for LinuxNetL3 calls unplug on the linux_net driver. Change-Id: I42d12cf8653c61436e89e97eaa384f26ee2ed707
* | | | | | | | | | | Merge "Fix linux_net.py interface-driver loading."Jenkins2012-03-121-6/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix linux_net.py interface-driver loading.Dan Wendlandt2012-03-121-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 950381 linux_net.py previously set the value of interface_driver based on a flag when the module was loaded. This breaks when nova-manage is used to invoke anything using the interface_driver, as nova-manage loads the nova.network.linux_net module before flags are properly set. This patch moves the initialization of the interface_driver variable to within a function that will only be called once flags are properly loaded. Note: this patch also fixes the unplug() action for the OVS vif-plugging code to actually remove the device created to act as the gateway device. Also tweaks the plug() to use the get_dev() method, reducing duplicate code. Change-Id: I97a17c010d4d6a67e2340a81315da00775c67eea
* | | | | | | | | | | | Merge "Fix nova-manage backend_add with sr_uuid"Jenkins2012-03-123-29/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix nova-manage backend_add with sr_uuidAlex Meade2012-03-093-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 950964 Remove FIXME in db.sm_backend_conf_get_by_sr Add first() to sm_backend_conf_get_by_sr query Change db/api.py:sm_backend_conf_get_by_sr to call correct impl method Have nova-manage generate an actuall sr_uuid instead of always 'None' Actually update backend values when specifying uuid Change-Id: I620da4563d8c936b5a072c4683ae145280104fc2
* | | | | | | | | | | | | Merge "Nuke some unused SQL api calls."Jenkins2012-03-122-254/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Nuke some unused SQL api calls.Dan Prince2012-03-122-254/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP bug #953235. Change-Id: Iafb33a74397a9037c31718018275d3a7d064f59b
* | | | | | | | | | | | Merge "Don't use glance when verifying images."Jenkins2012-03-122-109/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Don't use glance when verifying images.Michael Still2012-03-092-109/+64
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using glance means that admin contexts need to know how to use keystone when that is enabled. Its safer to avoid calling glance at all from inside the periodic task. This should resolve bug 934464. Change-Id: Ib730e3f57721fca7080d90ae80b5f8916c1dc76c
* | | | | | | | | | | Merge "Fix live-migration in multi_host network"Jenkins2012-03-122-22/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix live-migration in multi_host networkVishvananda Ishaya2012-03-122-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * call teardown after live migration * call update a second time after migration for dhcp * moves the instance state update into post_live_migrate * completes the fix for bug 939060 * fixes bug 947326 Change-Id: I042567573b9bb46381c5447aa08e83cd1916b225
* | | | | | | | | | | | Merge "Simply & unify console handling for libvirt drivers"Jenkins2012-03-124-51/+60
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Simply & unify console handling for libvirt driversDaniel P. Berrange2012-03-094-51/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the libvirt.xml.template file contains the following console definitions <!-- The order is significant here. File must be defined first --> <serial type="file"> <source path='${basepath}/console.log'/> <target port='1'/> </serial> <console type='pty' tty='/dev/pts/2'> <source path='/dev/pts/2'/> <target port='0'/> </console> <serial type='pty'> <source path='/dev/pts/2'/> <target port='0'/> </serial> There are multiple things wrong with this - LXC and Xen guests don't honour the <serial> elements - The <console> element shouldn't have any <source> element of 'tty' attribute set when type=pty, since they are dynamically allocated - The <console> element will ignored if the <serial> element is set and the hypervisor supports this - It doesn't say why multiple serial elements are used or why the order is important. The reason is that the QEMU pty driver throws away data when no client is connected. This means we can't use it as a basis for the persistent log file. Instead we need two separate serial ports, the first of which is used for the logfile In addition in the nova/virt/libvirt/connect.py class the 'get_console_output' method has separate special-case handling for Xen and LXC despite the fact that both work in the same way. All this can be significantly simplified, to unify console handling across all libvirt drivers. First replacing all the existing XML with just #if $type == 'qemu' <serial type='file'> <source path='${basepath}/console.log'/> </serial> <serial type='pty'/> #else <console type='pty'/> #end if This lets Xen/UML/LXC just use a regular PTY based console, while special casing QEMU. It is minimal XML, letting libvirt automatically fill in other attributes In the code, the get_console_output method can remove the explicit checks for Xen/LXC and instead be conditionalized based on what the XML shows. Finally calling out to 'virsh ttyiname' is pointless since nova already has a connection to libvirt which can be used to fetch the XML & extract the TTY path. Change-Id: I6a966df4ea72e07dbc227683c4225670984fc507 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | | Merge "Add a serializer for os-quota-sets/defaults."Jenkins2012-03-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a serializer for os-quota-sets/defaults.Kevin L. Mitchell2012-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug 953182. Change-Id: I273a1d3559a8218a0b1e1f3d973e55d079e92062
* | | | | | | | | | | | | | Merge "Add VDI chain cleanup script."Jenkins2012-03-121-0/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add VDI chain cleanup script.Rick Harris2012-03-091-0/+128
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References bug 949477 Change-Id: I819d4ed56675a4ef4e46adca2978b433386e128d
* | | | | | | | | | | | | | Import nova.exception so exception can be usedJohannes Erdfelt2012-03-121-0/+1
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id51e6763c73e5e705ae40c71c251d6a7198a74a6
* | | | | | | | | | | | | Merge "Replaced use of webob.Request.str_GET"Jenkins2012-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Replaced use of webob.Request.str_GETMaru Newby2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed webob.Request.str_GET => webob.Request.GET to ensure compatibility with WebOb >= 1.2. * Fixes bug 950478 Change-Id: I21d0d477340d31caa4c92fa76270a392b5eb2cca
* | | | | | | | | | | | | Merge "Set 'dhcp_server' in _teardown_network_on_host."Jenkins2012-03-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Set 'dhcp_server' in _teardown_network_on_host.Dan Prince2012-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update _teardown_network_on_host so that it sets 'dhcp_server' on network objects for compatability when using flat dhcp with linux_net. Fixes LP bug #951642. ('Network' object has no attribute 'dhcp_server') Change-Id: I53ab99155ea6e4163c9eb0b28b765f962f99a2b1
* | | | | | | | | | | | | Merge "fixup ldapdns default config"Jenkins2012-03-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fixup ldapdns default configPádraig Brady2012-03-091-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This results in cleaner sample configs generated from the new generator tool Change-Id: I2a8b7dd1ef3840cfb4e7e4ebcc416aaead2972ea
* | | | | | | | | | | | | Merge "Sub in InstanceLimitExceeded in overLimit message"Jenkins2012-03-124-7/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Sub in InstanceLimitExceeded in overLimit messageEoghan Glynn2012-03-104-7/+32
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 950768 Previously the error message in the 413 overLimit response returned by the OS compute API was missing a parameter subsitution indicating the actual quota that was breeched: 'Quota exceeded: code=%(code)s' This is now properly reported as: 'Quota exceeded: code=InstanceLimitExceeded' Also a potentially useful log message is no longer discarded. Change-Id: I7e1f8b078329a6530bb7d7ea3b006ff578cdcdd3
* | | | | | | | | | | | | Merge "Remove update lockmode from compute_node_get_by_host"Jenkins2012-03-121-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove update lockmode from compute_node_get_by_hostDerek Higgins2012-03-101-6/+5
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #948066 This commit removes the usage of an update cursor so postgres doesn't raise the error below SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer join Change-Id: Ia1ede22df38d5f6a24372e0ad8ec25151ad195c7