summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Final versioning for 2012.1.1" into stable/essex2012.1.1Jenkins2012-06-211-1/+1
|\
| * Final versioning for 2012.1.1Mark McLoughlin2012-06-211-1/+1
| | | | | | | | Change-Id: Iffd4a65c57be2835238dabfdd9e345355ab47632
* | Quantum Manager disassociate floating-ips on instance delete.Dan Wendlandt2012-06-171-0/+21
|/ | | | | | bug #997763 Change-Id: I4a1e6c63d2a27c361433b9150dd5ad5218578c02
* Merge "Don't query nova-network on startup." into stable/essexJenkins2012-06-155-18/+18
|\
| * Don't query nova-network on startup.Russell Bryant2012-06-155-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from commit 8db54f3. Fix bug 999698. nova-compute requested network info for each instance on startup via rpc. If all services get (re)started at the same time, nova-network may not be available to take this request, resulting in a lost request. To combat this issue, get the network info from the cache in the database on startup. If by some chance this information is not correct, it will get fixed up by a periodic task. Change-Id: Ifb0634e87770f565e4ab36a54f6e9e19e5f31632
* | Merge "Add missing ack to impl_qpid." into stable/essexJenkins2012-06-152-1/+10
|\ \ | |/ |/|
| * Add missing ack to impl_qpid.Russell Bryant2012-06-142-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1012374. Johannes Erdfelt pointed out that impl_qpid wasn't acking messages that it received. This turned out to be a nasty oversight, resulting in unbounded message queue growth inside of the python-qpid library. This fixes it. Change-Id: I0370293807f0282e1dbdd59246f70be031e888a9 (cherry picked from commit d15f3034dfab05ef0ec02b4e353b3dfa1512db35)
* | Merge "Ensure dnsmasq accept rules are preset at startup." into stable/essexJenkins2012-06-151-0/+1
|\ \
| * | Ensure dnsmasq accept rules are preset at startup.Russell Bryant2012-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1000853. This bug reported that after restarting nova-network, the dnsmasq ACCEPT iptables rules were no longer present, causing instances to lose their IP addresses. This patch updates the restart_dhcp() function in the linux_net driver to ensure these rules are present even if dnsmasq was already running. Before this was only done when first starting dnsmasq. (cherry picked from commit aa1e71d1b313f80f5581b1422e3f3e5719569e50) Change-Id: Icda3364d3a61018b912cea7a4c96b2cbcc1fbdd7
* | | Merge "bug #999953 xenapi driver intermittently fail to detach vbd" into ↵Jenkins2012-06-151-37/+34
|\ \ \ | | | | | | | | | | | | stable/essex
| * | | bug #999953 xenapi driver intermittently fail to detach vbdArmando Migliaccio2012-06-012-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure that unplug_vbd raises XenAPI.Failure as required by vbd_unplug_with_retry(session, vbd_ref). Change-Id: If689da4ebc5d9042f26c765afb02ae611967a66b
* | | | Merge "Updates the cache" into stable/essexJenkins2012-06-153-0/+11
|\ \ \ \
| * | | | Updates the cachedeevi rani2012-06-143-0/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 939122 Following are the changes done: 1. in compute/api.py to display the floating ip in nova list command upon its association with an instance. 2. in network/api.py to solve the similar issue upon the floating ip disassocaition Updated version of: https://review.openstack.org/#/c/7059 Change-Id: Ief1a3f544c3d14bd61cc0814612df3ee521ddec2 (cherry picked from commit 7097e01a15ecd5c28b6b771e5043f18da243607e)
* | | | Merge "Fix bug 1006664: describe non existent ec2 keypair" into stable/essexJenkins2012-06-152-0/+10
|\ \ \ \
| * | | | Fix bug 1006664: describe non existent ec2 keypairJoe Gordon2012-06-082-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92bfd6b51aa31abb06e21893174101da31baffd8 (cherry picked from commit 29baa0ec661c2578ad0aabd138a6b84e5c7a0b40)
* | | | | Merge "Add caching to openstack.common.cfg" into stable/essexJenkins2012-06-151-6/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add caching to openstack.common.cfgYuriy Taraday2012-06-131-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speedup of 'nova list' benchmark by up to 40%, eliminates 3 lines in top-10 cProfile methods. (includes subsequent refactoring by Mark McLoughlin) (cherry picked from commits 0d33dc3, 288939b and acf14ff) Change-Id: I2d4636f94d88b4a7e38d1565fdd4d1b8a89e560e
* | | | | Merge "Bump version to 2012.1.1" into stable/essexJenkins2012-06-141-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bump version to 2012.1.1Mark McLoughlin2012-06-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set version to 2012.1.1, but with final=False See http://wiki.openstack.org/StableBranchRelease Change-Id: Id7a910b34e1d42bf314f18ce69bf3ff674502435
* | | | | Merge "Implements resume_state_on_host_boot for libvirt." into stable/essexJenkins2012-06-145-2/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Implements resume_state_on_host_boot for libvirt.Dan Prince2012-06-115-2/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new virt driver function to help resume guest states on host boot. This fixes a couple issue with using a reboot (like we did previously): * Using reboot would clear some task states (VERIFY_RESIZE for example) * Provides a mechanism for hypervisor specific guest restarts. Reboot would not have worked for XenServer for example... * Updates libvirt to use a hard reboot (instead of soft) Fixes LP Bug #985162. Change-Id: Iaf5aad75ec9b91f44710a18ddaf3a93378573a62 (cherry picked from commit 6548c509f1780a7168f26de6f2045ec7d5768520)
* | | | Merge "Fix bug 988034 - Quantum Network Manager - not clearing ips" into ↵Jenkins2012-06-133-8/+16
|\ \ \ \ | |/ / / |/| | | | | | | stable/essex
| * | | Fix bug 988034 - Quantum Network Manager - not clearing ipsSomik Behera2012-06-013-8/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a line in nova_ipam_lib.QuantumNovaIPAMLib init method to ensure we clean up IPs and explanation of whats going on. Also, nuked release_fixed_ip as that is not needed in QuantumManager anymore. Change-Id: I3971b4d4c464ce68ba9370c9f5d8ca7840e0a72a
* | | Only invoke .lower() on non-None protocolsSoren Hansen2012-06-113-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using source group based security group rules (rather than CIDR based ones), it's permissible to not set a protocol and port. However, Nova would always try to convert the protocol to lower case, which would fail if the protocol wasn't set. Fixes bug 1010514 Change-Id: I9b1519a52ececd16a497acebfe022508cbe96126
* | | Create a utf8 version of the dns_domains table.Dan Prince2012-06-082-1/+95
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old dns_domains table was encoded in the 'latin1' charset and has its primary key length set to 512. This is too long to be a valid pkey in a proper 'utf8' encoded table and seems to cause a slew of errors like: 1) Dumping a database with mysqldump and trying to import it fails because this table is latin1 but fkeys to utf8 tables (projects). 2) Trying to alter the old dns_domains table fails with errors like: mysql> ALTER TABLE dns_domains DROP PRIMARY KEY; ERROR 1025 (HY000): Error on rename of './nova/#sql-6cf_855'.... This patch creates an Essex fix that re-creates the dns_domains table with a shorter 'domain' column which works with the utf8 charset. This database upgrade will run on MySQL databases only which have a dns_domains table with a domain column length of VARCHAR(512). Fixes LP Bug #993663 on Essex. Change-Id: I97888fbc18ebfc0e25c9ba31160588c9cdf5c448
* | Fix up protocol case handling for security groups.Vishvananda Ishaya2012-06-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 985184. When creating security group rules, any case for the protocol was accepted as input, such as TCP, Tcp, tcp, etc., and was stored in the database as specified. However, unless specified as all lowercase, the code to apply the rules would break and result in some rules not being applied. (cherry picked from commit ff06c7c885dc94ed7c828e8cdbb8b5d850a7e654) Change-Id: If737104f492aacd3688f04d78eb9bc993ffa33fc
* | Merge "Report memory correctly on Xen. Fixes bug 997014" into stable/essexJenkins2012-06-011-6/+29
|\ \
| * | Report memory correctly on Xen. Fixes bug 997014Alvaro Lopez Garcia2012-06-011-6/+29
| |/ | | | | | | | | | | | | /proc/meminfo may show wrong values for the memory when using Xen, so this correctly computes the memory by querying libvirt. Change-Id: I188e2d34bcee13954653b93b9b816cf4530b8859
* | Merge "Add libvirt get_console_output tests: pty and file" into stable/essexJenkins2012-06-012-1/+83
|\ \
| * | Add libvirt get_console_output tests: pty and fileDan Prince2012-06-012-1/+83
| |/ | | | | | | | | | | | | | | | | | | Add two new libvirt tests for the get_console_output: - test_get_console_output_pty - test_get_console_output_file Fixes LP Bug #990237. Change-Id: I308862c131c4c9c9c4accab1822039f8f5a775b4
* | Fix Multi_Scheduler to process host capabilitiesArmando Migliaccio2012-06-013-0/+29
|/ | | | | | | To fix bug #1000403, make sure that each driver held by the Multi Scheduler gets called during update_service_capabilities. Change-Id: If8a942317b9b26dd101c5bcf502aab7296608abd
* Nail pep8 dependencies to 1.0.1.Dan Prince2012-06-012-2/+2
| | | | | | | | | Nails the pep8 deps for tox and test-requires to 1.0.1. Fixes an issues causing pep8 failures due to a new pep8 release. (cherry picked from commit e3d7d3a) Change-Id: I30be4909f052c29834afbfddba6007045afa519b
* Merge "Fix type of snapshot_id column to match db" into stable/essexJenkins2012-05-181-1/+1
|\
| * Fix type of snapshot_id column to match dbVishvananda Ishaya2012-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrations create a snaphsot_id column that is an integer, but models incorrectly list it as a string. * The above issue causes errors in certain situations when trying to list instances. It seems to be only certain db configurations or versions of sqlalchemy that exhibit the issue. * Issue was fixed in trunk as part of a conversion to uuids in commit 407e16b863bac1dfbf4e954837009abf9c17f018 so a straight backport is not possible * Fixes bug 962615 Change-Id: I8e9fc9712c141822890feffee838faf8b41ee4f5
* | Merge "Generate a Changelog for Nova" into stable/essexJenkins2012-05-184-3/+158
|\ \
| * | Generate a Changelog for NovaChuck Short2012-05-154-3/+158
| |/ | | | | | | | | | | | | | | | | | | Ubuntu uses a tarball to generate packages for Nova and other openstack projects. This allows the user to find out what is included in the tarball. Signed-off-by: Chuck Short <chuck.short@canonical.com> Change-Id: I0291e19eee1ff2c5fc98b499571b2563841c6076
* | handle updated qemu-img info outputPádraig Brady2012-05-161-3/+11
|/ | | | | | | | | | | | | | | | | | | | | | | | Originally `qemu-img info` always output an (actual path: ...) even if it was duplicated with that already on the line. $ instances=/var/lib/nova/instances/ $ qemu-img info $instances/instance-00000017/disk | grep 'backing' backing file: $instances/_base/24083... (actual path: $the_same) Whereas after the change referenced at: https://lists.gnu.org/archive/html/qemu-devel/2012-05/msg01468.html It suppresses a duplicate (actual path:) $ instances=/var/lib/nova/instances/ $ qemu-img info $instances/instance-00000017/disk | grep 'backing' backing file: $instances/_base/24083... * nova/virt/libvirt/utils.py (get_disk_backing_file): Avoid an indexError exception when parsing the newer format. Fixes bug 1000261 Change-Id: Ie2889b6da8a5c93e0e874e7a330529f6e6e71b0b (cherry picked from commit 0624b7aab0c0fe4869111ad8e302151548d6ba20)
* Fix nova.tests.test_nova_rootwrap on Fedora 17.Russell Bryant2012-05-141-2/+2
| | | | | | | | | | Fix bug 992916 This patch resolves a unit test failure on Fedora 17. The root cause is that 'sleep' is '/usr/bin/sleep' instead of '/bin/sleep'. Update the test to allow that. Change-Id: I5c8e04baec7159a8c10c9beb96cff58fd383e71c
* Merge "Update KillFilter to handle 'deleted' exe's." into stable/essexJenkins2012-05-112-0/+18
|\
| * Update KillFilter to handle 'deleted' exe's.Dan Prince2012-05-042-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates KillFilter so that it handles the case where the executable linked to by /proc/PID/exe is updated or deleted. Fixes LP Bug #967931. Also added a unit test to test that 'deleted' exe's are filtered correctly. (cherry picked from commit b24c11b and commit 3d28e3d) Change-Id: I368a01383bf62b64b7579d573b8b84640dec03ae
* | Merge "Fix bug 983206 : _try_convert parsing string" into stable/essexJenkins2012-05-112-24/+23
|\ \
| * | Fix bug 983206 : _try_convert parsing stringJoe Gordon2012-05-092-24/+23
| |/ | | | | | | | | | | | | | | | | | | * _try_convert in ec2utils.py didn't handle strings starting with "0x" * Added tests to cover bug * Add better float support * remove unused complex number support Change-Id: I382d36f4a8671bcceccfa1ebdbae89a9d2aca207 (cherry picked from commit c95162e52899618fc269fb536f6a2d3b26b7794d)
* | Merge "QuantumManager will start dnsmasq during startup. Fixes bug 977759" ↵Jenkins2012-05-111-0/+17
|\ \ | | | | | | | | | into stable/essex
| * | QuantumManager will start dnsmasq during startup. Fixes bug 977759Mandar Vaze2012-05-102-0/+18
| |/ | | | | | | | | | | | | Added _setup_network_on_host method, which calls update_dhcp if quantum_use_dhcp is set. Change-Id: I193212037873001a03da7b7a484f61a5c13b5de8
* | Merge "Introduced flag base_dir_name. Fixes bug 973194" into stable/essexJenkins2012-05-116-9/+22
|\ \
| * | Introduced flag base_dir_name. Fixes bug 973194Mandar Vaze2012-05-096-9/+22
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | rebased from master. If user faces locking related problem when two nova-compute hosts sharing same disk area via nfs, try to download same image into cache concurrently - Then base_dir_name can be set to "_base_$my_ip" in nova.conf Default value for base_dir_name is "_base" thus retaining existing behavior. Change-Id: Icff10ed75ba83f7256731614dc9e01e578b347a4
* | Merge "Get unit tests functional in OS X" into stable/essexJenkins2012-05-112-0/+13
|\ \
| * | Get unit tests functional in OS XMatt Stephenson2012-05-082-0/+13
| |/ | | | | | | | | | | | | | | * Add detection for directio to ensure the python runtime is built with O_DIRECT * Extend stubbing in test_libvirt to also stub out _supports_direct_io Change-Id: Id793d4039311396f0b3c3a52d2a1d951ec3c5e48 (cherry picked from commit cf7c0a7c10723495953be9bf99aedbe3838e0787)
* | Fixes bug 952176MotoKen2012-05-101-1/+3
|/ | | | | | Checks if value is string or not before decode. Change-Id: I3f839770fdd7b00223ce02b95b2a265d903fa00e
* Fix timeout in EC2 CloudController.create_image()Eoghan Glynn2012-04-301-1/+1
| | | | | | | | | | Fixes bug 989764 The timeout bounding the wait for the instance to stop is intended to be 1 hour, but the code incorrectly specifies 60 hours instead (no practical client is going to wait that long for a response). Change-Id: I7aa4b539393df15f3b2c950cf7aeca4691ed3d73