summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update migration 076 so it supports PostgreSQL.Dan Prince2012-02-143-15/+32
| | | | | | Fixes LP Bug #32154. Change-Id: I9d6ddfedcc39308811ff5264879b45b4847ec4a8
* Merge "Add support for LXC volumes."Jenkins2012-02-143-2/+99
|\
| * Add support for LXC volumes.Chuck Short2012-02-083-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | This introduces volume support for LXC containers in Nova. The way that this works is that when a device is attached to an LXC container is that, the xml is parsed to find out which device to connect to the LXC container, binds the device to the LXC container, and allow the device through cgroups. This bug fixes LP: #924601. Change-Id: I00b41426ae8354b3cd4212655ecb48319a63aa9b Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | Merge "Replace ApiError with new exceptions"Jenkins2012-02-1435-230/+238
|\ \
| * | Replace ApiError with new exceptionsBrian Waldon2012-02-1435-230/+238
| | | | | | | | | | | | | | | | | | | | | | | | * Convert ApiError to EC2APIError * Add new exceptions to replace ApiError where it didn't belong * Fixes bug 926250 Change-Id: Ia711440ee0313faf8ea8c87e2c0a2f5b39cc55a2
* | | Merge "e2fsck needs -y"Jenkins2012-02-141-1/+1
|\ \ \ | |/ / |/| |
| * | e2fsck needs -yRick Harris2012-02-141-1/+1
| | | | | | | | | | | | | | | | | | Fixes bug 932257 Change-Id: I396c3498bca8f3e1a5131db81e6e0d1900b6f09f
* | | Standardize logging delaration and useJason Kölker2012-02-14219-269/+325
|/ / | | | | | | | | | | * Make modules use getLogger(__name__) and log to the result Change-Id: Ib6d69b4be140ec89affc86ed11e65e422d551df1
* | Merge "Fix WADL/PDF docs referenced in describedby links"Jenkins2012-02-143-28/+36
|\ \
| * | Fix WADL/PDF docs referenced in describedby linksEoghan Glynn2012-02-143-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These compute API links were broken, previously referring to Rackspace URLs with s/v1.0/v1.1/ The links now correctly reference long-lived locations on docs.openstack.org. Change-Id: I10efca2868a05982a1783688e374060acf1d0a69
* | | Merge "clean pyc files before running unit tests"Jenkins2012-02-141-0/+3
|\ \ \
| * | | clean pyc files before running unit testsJoe Gordon2012-02-131-0/+3
| | | | | | | | | | | | | | | | Change-Id: If7ad58f131d8b780125df7ecb5c4081014064f72
* | | | Merge "typo fix"Jenkins2012-02-141-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | typo fixJoe Gordon2012-02-131-1/+1
| |/ / | | | | | | | | | Change-Id: I001b5d18c50b71e68fe6277d5f8558551a0ad377
* | | Merge "Changes for supporting fast cloning on Xenserver. Implements ↵Jenkins2012-02-149-20/+268
|\ \ \ | |/ / |/| | | | | blueprint fast-cloning-for-xenserver 1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 2. image-id is used to tag an image which has already been streamed from glance. 3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host."
| * | Changes for supporting fast cloning on Xenserver.Devdeep Singh2012-02-139-20/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements blueprint fast-cloning-for-xenserver 1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 2. image-id is used to tag an image which has already been streamed from glance. 3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host. Change-Id: I54838a24b061c134877f3479c925c6ee78da14bc
* | | Merge "get_user behavior in ldapdriver"Jenkins2012-02-142-1/+11
|\ \ \
| * | | get_user behavior in ldapdriverjohn-griffith2012-02-132-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Addresses bug 744462 Rather than ldapdriver.get_user() returning None for non-existent user, this change implements exception.LDAPUserNotFound to more closely match the behavior of other drivers (db). Change was made in public method only, and _check_user_exists() which uses get_user() now catches and returns None if applicable. Implemented test of NotFound exception in base auth test class. Change-Id: Ia13af759931ca0c7327d54184730537bafbe52ae
* | | | Merge "Fsck disk before removing journal"Jenkins2012-02-141-10/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fsck disk before removing journalRick Harris2012-02-131-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 931743 Change-Id: Ibf257ca74432f8e6387ffae58f6b38477de59272
* | | | Merge "Handle refactoring of libvirt image caching."Jenkins2012-02-142-64/+167
|\ \ \ \
| * | | | Handle refactoring of libvirt image caching.Michael Still2012-02-092-64/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch handles the refactored image caching for libvirt. The new scheme keeps multiple copies of an image: <fingerprint>: the image from glance <fingerprint>_<size>: the resized image The resized image is then copied or CoW'd across to the instance disk. We also want to keep original images from glance longer than we keep the resized images, as they're smaller and this reduces the load on glance. Therefore a new flag to handle the differing rules has been added. Change-Id: If6d9471b3d67cb8fac3f168b1b4a3cd57b9cc9a7
* | | | | Merge "bug 929428: pep8 validation on all xapi plugins"Jenkins2012-02-141-2/+4
|\ \ \ \ \
| * | | | | bug 929428: pep8 validation on all xapi pluginsArmando Migliaccio2012-02-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check every python file under <nova_root>/plugins/xenserver/. Ignore patch files. Change-Id: Ib1170ddabe03de746aae570d30b133aaffb09c88
* | | | | | Merge "Pass instance to log messages."Jenkins2012-02-141-24/+23
|\ \ \ \ \ \
| * | | | | | Pass instance to log messages.Michael Still2012-02-102-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts more log messages to passing their instance. Having the instance in a consistant format in the logs makes it easier for operations staff to debug instance problems. Change-Id: I842f26309e17c0923e71fbfb00bdcdb033f92297
* | | | | | | Merge "fix FlatNetworkTestCase.test_get_instance_nw_info"Jenkins2012-02-131-9/+12
|\ \ \ \ \ \ \
| * | | | | | | fix FlatNetworkTestCase.test_get_instance_nw_infoPádraig Brady2012-02-101-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this function was bypassed and the bypassed portion contained syntax errors. So reneable the skipped branch and adjust to pass. Change-Id: I364ccfbe5be5bc050ba0004133f353beed97fae7
* | | | | | | | Merge "remove a private duplicate function"Jenkins2012-02-131-19/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | remove a private duplicate functionPádraig Brady2012-02-131-19/+10
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nova/network/ldapdns.py (utf-8): This function is already available in nova.utils. Note this duplicate was catching impossible to trigger exceptions, and was referencing an undefined variable 'val' Change-Id: I0e47f8b976a3326c99927990f91be473c0a85f78
* | | | | | | | Merge "remove unused and buggy function from S3ImageService"Jenkins2012-02-131-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | remove unused and buggy function from S3ImageServicePádraig Brady2012-02-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nova/image/s3.py (S3ImageService.get): Remove Change-Id: Ibe4526c821b9d05025956d49a6cb840d11ce013a
* | | | | | | | | Merge "Use stubs in libvirt/utils get_fs_info test"Jenkins2012-02-131-11/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Use stubs in libvirt/utils get_fs_info testMark Washenberger2012-02-131-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test frequently breaks for me because of a race condition where some small change will happen to the file system between when df is called and when os.statvfs is called. By refactoring the test to stubs, we can eliminate the race condition. Note that I do not modify the code under test at all in this change, so the risk of introducing a defect is zero. Change-Id: I83e4b38b25fef7e5e27fcf81b5e5a566406b05dd
* | | | | | | | | Merge "Adding (-x | --stop) option back to runner.py"Jenkins2012-02-131-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding (-x | --stop) option back to runner.pyAlex Meade2012-02-131-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 931608 Change-Id: I355a3bba38367c820a0eddc006ef480e5134b317
* | | | | | | | | Merge "dont show blank endpoint headers"Jenkins2012-02-133-16/+35
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | dont show blank endpoint headersNikhil Komawar2012-02-073-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug: 741972 Change-Id: I4a661a13c5baaa79ee647a6c1cedcef29a2642f6
* | | | | | | | | Merge "Remove duplicate variable"Jenkins2012-02-131-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicate variableJohannes Erdfelt2012-02-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie92a534c566dd411c2bd3e73031336974b1e5505
* | | | | | | | | | Fixing a unicode related metadata bug.Naveed Massjouni2012-02-133-7/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a server had metadata with unicode characters in the values, doing a GET on servers details would return a 500 error. This fixes that bug. bug: 929281 Change-Id: I6162532c9a5a615802eb23e7bf9a80d3faf6e7a0
* | | | | | | | | Merge "Make melange_port an integer"Jenkins2012-02-131-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make melange_port an integerJohannes Erdfelt2012-02-131-3/+3
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's nonsensical as anything but an integer and it makes it clearer what type it should be. Change-Id: Icd62023b1835d33fb977302208744657e4557d2a
* | | | | | | | | Merge "Log instance id consistently inside the firewall code."Jenkins2012-02-132-9/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Log instance id consistently inside the firewall code.Michael Still2012-02-102-9/+14
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings this code inline with the way connection.py does instance logging now. Change-Id: I3a9b256cb87bc273352f4b9338ae32dbc1faa6f6
* | | | | | | | | Merge "Fix minor typo in runner.py"Jenkins2012-02-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix minor typo in runner.pyHengqing Hu2012-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #930519 Change-Id: I53f5f85d1ef8117f6a40a90ee1e9eb12a27dcd53
* | | | | | | | | Merge "Converting db tables to utf8."Jenkins2012-02-111-0/+61
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Converting db tables to utf8.Naveed Massjouni2012-02-101-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 929232 Change-Id: I6bea01b243e0c9dbd7e3b3559adbb73e42484a4c
* | | | | | | | | Merge "remove all instance_type db lookups from network"Jenkins2012-02-117-50/+29
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |