summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Remove duplicate methodJohannes Erdfelt2011-11-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The real implementation of _get_view_builder() is at the bottom of the class Change-Id: I7b1fb4acb51de00b542093ae54d42b1b73083063
* | | | | | | | | Merge "Remove debugging print"Jenkins2011-11-091-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove debugging printJohannes Erdfelt2011-11-081-1/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd036099c59d84cdc977dc0f8e76475df31174dd
* | | | | | | | | Merge "Remove duplicate method (2)"Jenkins2011-11-091-6/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicate method (2)Johannes Erdfelt2011-11-081-6/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is duplicated directly beneath it. Mismerge? Change-Id: Ic6b8e06005f78d8009c8d1f897f253c4084a758d
* | | | | | | | | Merge "Skip libvirt tests when libvirt not present."Jenkins2011-11-081-70/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Skip libvirt tests when libvirt not present.Brian Lamar2011-11-031-70/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the libvirt tests don't make use of the test.skip_if decorator. This should make it more obvious when the tests are not getting run. We recently ran into an issue where libvirt tests were 'passing' in Jenkins but they were actually not getting run, this should make things more clear. Change-Id: Ied18d2403fc9accd6c6f739b08c9fe7cc3624bb2
* | | | | | | | | | Merge "Correcting libvirt tests that were failing"Jenkins2011-11-081-7/+6
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Correcting libvirt tests that were failingBrian Waldon2011-11-031-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 885037. With this merge prop we need to get libvirt tests running in Jenkins. Change-Id: I48e69f8ef3b70036f5d161c85b6c423344a695a2
* | | | | | | | | Merge "Move failed instances to error state"Jenkins2011-11-082-15/+72
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Move failed instances to error stateAaron Lee2011-11-072-15/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On instance creation there is the possibility of an instance raising. This would not cause the instance to be moved to the error state. This patch fixes that. lp885323 update 1: fixing exception handling update 2: preserving the individual messages update 3: rebase on master & fix spacing Change-Id: I7584b527e408c08014f1b6a8abda343f1e2aa3b8
* | | | | | | | | Merge "Add DHCP support to the QuantumManager and break apart dhcp/gateway"Jenkins2011-11-0814-138/+482
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add DHCP support to the QuantumManager and break apart dhcp/gatewayBrad Hall2011-11-0414-138/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new flag "quantum_use_dhcp=<boolean>" which indicates whether or not to enable dhcp for all of the networks. If it is set then we start dnsmasq (and provide it with the IP/MACs from Melange) similar to how this was done in linux_net before. Prior to this if you enabled dhcp then you would also get a gateway device.. some people may not want that so we now require that you specify the gateway when creating the network in order to end up with a device that will act as a gateway. If you're using Melange IPAM and you don't specify the gateway you still end up with one because it doesn't allow you to not have one. This lays the groundwork for the option of not having one in the future, at least :) Also, fix quantum/melange ipam interaction We now query for the subnets by net_id/vif_id instead of searching through all the blocks to find the right one. Both of the allocate and deallocate for instance calls are now using the vif_id -> network_id mapping instead of searching the quantum networks. get_port_by_attachment was also changed to take a net_id so that we don't have to search through all of the quantum networks to find the corresponding port. Change-Id: I6a84da35237b6c5f5cdee91ada92642103439a97
* | | | | | | | | | Merge "Set task state to UPDATING_PASSWORD when needed"Jenkins2011-11-083-1/+44
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Set task state to UPDATING_PASSWORD when neededBrian Waldon2011-11-073-1/+44
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 885389 Change-Id: Ia4b91fc8ccc55cac4f484f64c73398e803480eac
* | | | | | | | | Merge "Change network delete to delete by uuid or cidr"Jenkins2011-11-086-14/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change network delete to delete by uuid or cidrBrad Hall2011-11-046-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With melange it will be possible to have overlapping cidrs so it would be better to specify the uuid of the network to delete. Change-Id: I6781225d587952cbab3387cd40164d8ac77c58d6
* | | | | | | | | | Merge "Speed up tests a further 35 seconds"Jenkins2011-11-089-632/+407
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Speed up tests a further 35 secondsJohannes Erdfelt2011-11-049-632/+407
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes more OSAPI tests to using their Controller directly, bypassing the slow wsgi setup process. Change-Id: Ic014c32786cb10c541f7d367573adb7a069c1a88
* | | | | | | | | | Merge "Adds extended status information via the Admin API to the servers calls"Jenkins2011-11-084-1/+221
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds extended status information via the Admin API to the servers callsMatt Dietz2011-11-084-1/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I294e64e878f1f6ebf33b83198abb2cdd8b6c5185
* | | | | | | | | | | Merge "changes logging reference in zone_manager.py"Jenkins2011-11-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | changes logging reference in zone_manager.pyAlex Meade2011-11-081-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug 886281 Change-Id: Ib0312ecc2a0026a08d37a382144d37d745dea6ce
* | | | | | | | | | | Merge "Switch glance XenAPI plugin to use urllib2."Jenkins2011-11-081-12/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Switch glance XenAPI plugin to use urllib2.Brian Lamar2011-11-081-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the plugin uses httplib which does not handle redirects natively. XenAPI plugins require Python 2.4+ so using httplib2 as far as I know is not a possibility. (Patch Set 2) Oops, forgot to PEP8 before putting up for review. (Patch Set 3) Updated logging to be more verbose as per Waldon Change-Id: I189093fe26dfee30b5b8b3c0f2c21a35fbfbc05e
* | | | | | | | | | | | Wait until the instance is booted before setting VCPU_params.Josh Kearney2011-11-082-3/+9
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 886189. Change-Id: Ief0af1ef60aef3debce0a1e4a1ad4819c927e048
* | | | | | | | | | | Exception cleanup in schedulerJoe Gordon2011-11-0814-65/+48
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes NoValidHost and willNotSchedule by moving them to exception.py Removed unneeded imports Change-Id: Ib9bb4b36d5e4c00667bd0b2d73137ba9eac5b3b0
* | | | | | | | | | Merge "Optional --no-site-packages in venv"Jenkins2011-11-082-5/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Optional --no-site-packages in venvLorin Hochstein2011-10-302-5/+27
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a flag to run_tests.sh to allow user to optionally install venv with --no-site-packages. This fixes bug 880905 Change-Id: Ic645e0ec56c90b72fef526ebc9f55975d446e2ae
* | | | | | | | | | Merge "Fixing create_vbd call per VolumeHelper refactoring"Jenkins2011-11-082-9/+14
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixing create_vbd call per VolumeHelper refactoringRick Harris2011-11-082-9/+14
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a34984104b5c62e9b494beef521e447104ec408
* | | | | | | | | Merge "Removing duplicate kernel/ramdisk check in OSAPI"Jenkins2011-11-083-118/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removing duplicate kernel/ramdisk check in OSAPIBrian Waldon2011-11-043-118/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 886169 Change-Id: Id68de3284367e789f1295b61fe6bf9c400470ba8
* | | | | | | | | | Merge "Remove unnecessary image list in OSAPI"Jenkins2011-11-081-2/+0
|\| | | | | | | | |
| * | | | | | | | | Remove unnecessary image list in OSAPIBrian Waldon2011-11-041-2/+0
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 886139 Change-Id: I152b0e29a5742b7fc0fb25fc64f5bfb25f351b56
* | | | | | | | | Merge "Adding task_states.REBOOTING_HARD"Jenkins2011-11-086-5/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding task_states.REBOOTING_HARDBrian Waldon2011-11-076-5/+61
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 884906 Change-Id: I546d0ddd7afee7596a4c47053dae3cb3ba18fdb2
* | | | | | | | | Merge "Added code to libvirt backend to report state info."Jenkins2011-11-083-7/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added code to libvirt backend to report state info.Lorin Hochstein2011-10-273-7/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also renamed property variable in Xen code to make it consistent with nova conventions. Implements blueprint kvm-report-capabilities Change-Id: I7953e857d9b8ce4b410c31b82cead7aaa3fb911f
* | | | | | | | | | Blueprint lasterrorgaryk2011-11-082-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add in a log report to nova-manage Usages: Get the last errors in the nova logs nova-manage logs errors Get the last x nova messages in the syslog. The default is 10 nova-manage logs syslog <x> Change-Id: Id5d3a546051e25175b6523711f437618d07c3f19
* | | | | | | | | | Merge "Add auto-reloading JSON config file support to scheduler."Jenkins2011-11-0811-152/+350
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add auto-reloading JSON config file support to scheduler.Sandy Walsh2011-11-0411-152/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This branch adds the ability to define a local JSON file that will hold configuration information that the scheduler can use. This dict will be passed into the filter and weighing functions so that Operations can tweak the scheduler without having to bring down the scheduler service. Currently the polling time on the file is hardcoded at 5 minutes, but certainly this could be made into a flag. Next update will be to remove the host_filter and weighing_functions flags and fix the scheduler to get these values from the config file. Change-Id: Ia2487e933483761276058689fad84564d96a451e
* | | | | | | | | | | Merge "Fix for launchpad bug #882568"Jenkins2011-11-081-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix for launchpad bug #882568Brad Hall2011-11-031-1/+10
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tunctl to create the tap device if we are on a system where the ip command is too old (and doesn't have support for tuntap). Change-Id: I9e22010e4c7dd2671267de6d0e7a7bc9ae76a854
* | | | | | | | | | | Merge "Removed autogenerated API .rst files."Jenkins2011-11-08139-969/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed autogenerated API .rst files.Lorin Hochstein2011-10-27139-969/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed .rst files that are automatically generated using the nova_autodoc extension. It's not really worth keeping these in the repo since users can regenerate the files at will, and the content is also available at nova.openstack.org. Change-Id: I6c93f9aae1994961fdca690742398a0d540d541f
* | | | | | | | | | | | Merge "Clean up docstrings for faults.Fault and it's usage"Jenkins2011-11-082-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clean up docstrings for faults.Fault and it's usageJohannes Erdfelt2011-11-072-1/+4
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many extensions wrapped exceptions manually with faults.Fault and ther continues to be some confusion if it's necessary. This patch clears up what faults.Fault does as well as documents that wsgi.Resource automatically wraps webob.exc.HTTPException Change-Id: Ieed63b8641499bc7449bae2684d5f63e5839d369
* | | | | | | | | | | | Merge "Change floating-snat to float-snat"Jenkins2011-11-081-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change floating-snat to float-snatBrad Hall2011-11-041-4/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With iptables v1.4.10 I'm running into an issue with the chain length of the "nova-dhcpbridge-floating-snat" table (iptables it complaining that the name is too long; 28 chars max). This shortens the name of that table. Change-Id: I00b1003aaa0b3771c29d6459d07023a8caa47706