summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "bug 929462: compile_diagnostics in xenapi erronously catch ↵Jenkins2012-02-185-5/+11320
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XenAPI.Failure"
| * | | | | | | | | | | bug 929462: compile_diagnostics in xenapi erronously catch XenAPI.FailureArmando Migliaccio2012-02-175-5/+11320
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure we catch the right exception. Plus turn test_diagnostics into a more thorough unit test. Change-Id: I1aae28b9b3b942f08e419cd9cfa48dea003e96d9
* | | | | | | | | | | Merge "Query directly for just the ip"Jenkins2012-02-184-16/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Query directly for just the ipJason Kölker2012-02-174-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes LP934356 Change-Id: I99b1501b1ef86eafb89fe9416f2668e4325a3656
* | | | | | | | | | | | Merge "Partial fix for bug 919051"Jenkins2012-02-184-5/+217
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Partial fix for bug 919051Joe Gordon2012-02-174-5/+217
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test instance and volume IDs Change-Id: Icbdeb3a082e3e85f7d1698875529bfffbf6fa5f2
* | | | | | | | | | | Merge "Use new style instance logging in compute api."Jenkins2012-02-181-7/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use new style instance logging in compute api.Michael Still2012-02-181-7/+7
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e5682e902faf0fbcea5c85900d8e3da89482cc8
* | | | | | | | | | | Merge "Fix traceback running instance-usage-audit"Jenkins2012-02-182-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix traceback running instance-usage-auditMonsyne Dragon2012-02-172-2/+4
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two errors here: 1 was a missed joinload that was causing an error pulling info_cache. 2 the exception listed in the bug, which was caused by tring to load data for a deleted instance. This fixes bug 934539 Change-Id: Ifffb6a35c1f7bf8caa6f57d33b29b58d0dbe10b3
* | | | | | | | | | | Merge " remove unused nwfilter methods and tests."Jenkins2012-02-183-294/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | remove unused nwfilter methods and tests.Yaguang Tang2012-02-153-294/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused methods and classes in nova/virt/libvirt/firewall.py and releative function tests. now,nova use nwfilter offered by libvirt only for anti ARP and IP spoofing.other security policy use iptables. Change-Id: Ib9866802ef64668e2feba09124bdf7c7fee92f92
* | | | | | | | | | | Merge "Fixes nova-volume support for multiple luns"Jenkins2012-02-176-35/+159
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes nova-volume support for multiple lunsVishvananda Ishaya2012-02-166-35/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stores lun in provider_location if specified * passes lun in iscsi_properties instead of hard coding * adds call to libvirt to list all used block devices * make sure to synchronize connect and disconnect commands * only disconnect from target if no luns are in use * allow double logins to targets * fixes typo in get_volume_connector in xenapi_connection * fixes bug 929790 Change-Id: I2466dc750a6fa5e0b07f94314d38873740aa6b29
* | | | | | | | | | | | Merge "Fix bug 933147 Security group trigger notifications."Jenkins2012-02-175-2/+193
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix bug 933147 Security group trigger notifications.Dave Lapsley2012-02-165-2/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a lightweight mechanism to allow security group trigger notifications to be propagated to quantum security group handlers. Add a global flag: "security_group_handler" to allow for runtime selection of security group handler class. Change-Id: I8a3768c26c97020071ad4e52d3a22d8898e72e9f
* | | | | | | | | | | | Merge "Pulls the main components out of deallocate."Jenkins2012-02-172-51/+84
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Pulls the main components out of deallocate.Aaron Lee2012-02-172-51/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deallocate_for_instances is basically deallocate the port, then delete the vif. This separates them. update one: hacking within the lines update two: another hacking fix update three: rebase update four: rebase and detrailingslashify Change-Id: I01e06a9225d7825af5d404d5815f5084c7660799
* | | | | | | | | | | | | Merge "Adding traceback to async faults"Jenkins2012-02-175-91/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Adding traceback to async faultsAlex Meade2012-02-175-91/+157
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 930278 Change-Id: If70922e07c68275459d0d3ca8d7cfc6fee20f425
* | | | | | | | | | | | Merge "Simple way of returning per-server security groups"Jenkins2012-02-172-0/+73
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Simple way of returning per-server security groupsJustin Santa Barbara2012-02-142-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #909207 Change-Id: I7d111222210eaf3abfbae5bc7cccb6e823affc45
* | | | | | | | | | | | | Merge "Enables hairpin_mode for virtual bridge ports, allowing NAT reflection"Jenkins2012-02-173-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Enables hairpin_mode for virtual bridge ports, allowing NAT reflectionEvan Callicoat2012-02-163-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enables hairpin_mode on virtual bridge ports on instance spawn * adds conntrack DNAT state criteria to fixed/fixed SNAT exception so reflected traffic SNATs * updates get_interface ElementTree to work with Python 2.6/2.7 * fixes bug 933640 Change-Id: I63b3e91b41898fcffda8a288be503f9b740b4b4e
* | | | | | | | | | | | | | Merge "Add JSONFormatter"Jenkins2012-02-172-1/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add JSONFormatterJason Kölker2012-02-172-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allows formating log messages in JSON format Change-Id: I9c5b4e20fff0a055b7178acaf862e838d62abaa0
* | | | | | | | | | | | | | | Merge "The security_group name should be an XML attribute"Jenkins2012-02-172-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | The security_group name should be an XML attributeJustin Santa Barbara2012-02-162-3/+14
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is everywhere apart from in servers.py. We have to be backwards compatible, so we check the attribute first, and then check the element. Bug #933785 Change-Id: I66b96376043e665a026eff5c33aa0731a81730cc
* | | | | | | | | | | | | | | Merge "improve stale libvirt images handling fix. Bug 801412"Jenkins2012-02-171-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | improve stale libvirt images handling fix. Bug 801412Pádraig Brady2012-02-141-2/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the unlink fails (because the path wasn't even created for example), then that will shroud the original failure. Instead log failure to remove the stale image, and raise the original exception. Change-Id: I36c6968823bcf81d704319739b3a992dae75266a
* | | | | | | | | | | | | | | Merge "Fix bug 929427"Jenkins2012-02-171-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix bug 929427Alvaro Lopez Garcia2012-02-161-5/+5
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We ensure that we are getting the info from a QCOW2 image, not anything else. Change-Id: I8b6bd504da8d52bb9902c917360f0465f9002551
* | | | | | | | | | | | | | Merge "Adding tests for NovaException printing"Jenkins2012-02-171-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Adding tests for NovaException printingAlex Meade2012-02-151-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23fe7031dc2d8ffe2c8646c9b356045ef2d4d233
* | | | | | | | | | | | | | Merge "improve injection diagnostics when nbd unavailable. Bug 755854"Jenkins2012-02-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | improve injection diagnostics when nbd unavailable. Bug 755854Pádraig Brady2012-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better to fail immediately with this improved diagnostic. Relying on qemu-nbd to detect the issue (no device), is inefficient. Change-Id: Ib124f6b83d8f04f0b4791c98912603f3499a9d2a
* | | | | | | | | | | | | | | Merge "Move translations to babel locations."Jenkins2012-02-1726-5593/+7469
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Move translations to babel locations.Monty Taylor2012-02-0826-5593/+7469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we structure things like this, we can get things actually, you know, installed. Locales ast and oc aren't supported by babel. We'll re-import them from Launchpad once we get babel updated. If you want translations installed, run: python setup.py compile_catalog Before you run either setup.py sdist or setup.py install More work is needed to actually properly use the installed translations, but we're closer. Change-Id: I4a4bedd982c89063aa09688c9cbcf97054bcb34b
* | | | | | | | | | | | | | | | Merge "bug 931356: nova-manage prints libvirt related warnings if libvirt ↵Jenkins2012-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isn't installed"
| * | | | | | | | | | | | | | | | bug 931356: nova-manage prints libvirt related warnings if libvirt isn't ↵Armando Migliaccio2012-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed move flag declaration close to where it is used. Change-Id: I88c3d1362a9de5ea559411e80c1e5bc79bd1a614
* | | | | | | | | | | | | | | | | Merge "Add some more comments to _get_my_ip()."Jenkins2012-02-171-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add some more comments to _get_my_ip().Russell Bryant2012-02-121-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 930513. This patch adds some additional comments to _get_my_ip() to try to make the code a bit more clear and to clarify that no traffic is actually sent out by this code. Change-Id: I6f8d4a0a51596e5c531da53f3c79c5bffca59b39
* | | | | | | | | | | | | | | | | Merge "Use new style instance logging in compute manager."Jenkins2012-02-171-62/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use new style instance logging in compute manager.Michael Still2012-02-141-62/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I98572bf762da6dc0b5882f6f3d20950440cf4992
* | | | | | | | | | | | | | | | | | Merge "Run ovs-ofctl as root"Jenkins2012-02-171-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Run ovs-ofctl as rootTomoe Sugihara2012-02-171-2/+3
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ovs-ofctl requires root privilege, nova-network would fail during allocate_for_instance. This fixes the issue. Change-Id: I188f1a4fdf4998c51f8626b37efd175039d23227
* | | | | | | | | | | | | | | | | Merge "Print friendly message if no floating IPs exist."Jenkins2012-02-171-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Print friendly message if no floating IPs exist.Russell Bryant2012-02-151-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 932071. Print out a friendly message from nova-manage when the "floating list" command is issued but no floating IPs have been defined. Prior to this change, a generic error message would be printed, pointing to the log for further details. Change-Id: I0d11f93e9f51cf4e99e319bc9296f73380564257
* | | | | | | | | | | | | | | | | | Merge "LOG.exception does not take an exc_info keyword"Jenkins2012-02-171-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | LOG.exception does not take an exc_info keywordJohannes Erdfelt2012-02-171-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will automatically call sys.exc_info() anyway Change-Id: I6a279bb18d913938d933a486e42a3be38bfaccb4