summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Send a more appropriate error response for 403 in osapiAnthony Young2012-03-232-1/+14
| |/ | | | | | | | | | | | | * Don't use resizeNotAllowed for 403 * Fixes bug 949444 Change-Id: Ib2b5acba291a04e0c0296fa5e8438019983dda20
* | Merge "Volumes API now uses underscores for attrs"Jenkins2012-03-235-112/+112
|\ \
| * | Volumes API now uses underscores for attrsBrian Waldon2012-03-235-112/+112
| |/ | | | | | | | | | | * Fixes bug 943053 Change-Id: I7066e963b4377a4a1f8a3c259e6273e6a0ca073f
* | Merge "Remove unused certificate SQL calls."Jenkins2012-03-232-36/+0
|\ \
| * | Remove unused certificate SQL calls.Dan Prince2012-03-232-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused certificate_destroy and certificate_update functions from the DB api. Fixes LB Bug #953235. Change-Id: I2e3e07235467b2a5a11e228c2ed8db752c403ce3
* | | Use key in locals() that actually existsJohannes Erdfelt2012-03-231-2/+3
| |/ |/| | | | | | | | | | | | | | | Fixes bug 963263 Also, fix whitespace so we don't end up with two almost identical strings to internationalize Change-Id: I4c4faa0c335bdafca9426e2056113bb6f87abc3a
* | Merge "Tweak security port validation for ICMP"Jenkins2012-03-236-19/+68
|\ \ | |/ |/|
| * Tweak security port validation for ICMPGreg Althaus2012-03-166-19/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Horizon allows for ICMP to be type:code. Type and code can be from -1 to 255. API refers to both EC2 and Nova APIs This patch attempts to resolve: 1. API code throws exceptations when 0 is passed for either field 2. API code validates type:code like from->to range. type and code are independent 3. Update unit tests for this new set of operations. A side effect is that the following are allowed type:code. -1:X X:-1 The code assumes that -1 is a wildcard for the field. bug 956967 Change-Id: Ieb6989815afc6986b72e0efc7611c2cc353ab5d8
* | Merge "Fixed status validation. Fixes bug 960884."Jenkins2012-03-222-1/+4
|\ \
| * | Fixed status validation. Fixes bug 960884.Unmesh Gurjar2012-03-222-1/+4
| | | | | | | | | | | | | | | | | | | | | Fixed the status value validation in os-hosts extension and added a negative scenario in unit test for os-hosts extension. Change-Id: Ib4166757561e531494a1a4d3070d7c8971b57dc5
* | | Assume migrate module missing __version__ is oldMark Washenberger2012-03-221-5/+3
| | | | | | | | | | | | | | | | | | Fixes bug 962592 Change-Id: I9675b99df89d4f2d47e0a2fbfd13147fa1c7aeb7
* | | Merge "Remove tools/nova-debug"Jenkins2012-03-222-99/+1
|\ \ \
| * | | Remove tools/nova-debugJoe Gordon2012-03-222-99/+1
| | | | | | | | | | | | | | | | | | | | | | | | Broken and outdated (last updated on Mon Jun 27 2011) Change-Id: I3ed67430e01c2db531b89bc3ffd6e7b174791fbc
* | | | Merge "Inlining some single-use methods in XenAPI vmops."Jenkins2012-03-221-28/+16
|\ \ \ \
| * | | | Inlining some single-use methods in XenAPI vmops.Rick Harris2012-03-221-28/+16
| |/ / / | | | | | | | | | | | | Change-Id: I28247b6fe782f3a1007c6f47eb8e221cf885772f
* | | | Merge "Modify nova.wsgi.start() should check backlog parameter."Jenkins2012-03-222-0/+5
|\ \ \ \
| * | | | Modify nova.wsgi.start() should check backlog parameter.Sean Dague2012-03-212-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 883292. Forward ported from https://github.com/ntt-pf-lab/nova/tree/openstack-qa-nova-883292 Change-Id: I8839851a72fcf0910a532d558ffe66a39a7db1e8
* | | | | Merge "Re-instate security group delete test case"Jenkins2012-03-221-0/+19
|\ \ \ \ \
| * | | | | Re-instate security group delete test caseMark McLoughlin2012-03-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While fixing lp#956366, we realized that it's fine to delete a security group referenced by an ingress rule of another security group because the ingress rule gets deleted. Re-instate the test for this specific case, but test that the ingress rule gets deleted rather than an exception being thrown. Change-Id: I81ad16431f5f8f13561dfcb320213366e1e8864e
* | | | | | Merge "Make sqlite in-memory-db usable to unittest"Jenkins2012-03-226-71/+114
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make sqlite in-memory-db usable to unittestHengqing Hu2012-03-176-71/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move migrate monkey patch from nova.tests.test_migrations to nova.db.sqlalchemy.migration Change-Id: I018e44903558cad6311fd368787583322f962d0c
* | | | | | Change mycloud.com to example.com (RFC2606).James E. Blair2012-03-2212-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From RFC2606: To reduce the likelihood of conflict and confusion, a few top level domain names are reserved for use in private testing, as examples in documentation, and the like. Currently the documentation contains URLs that point to mycloud.com, which is registered and not affiliated with OpenStack. It's better to use example.com which exists for this purpose. Change-Id: I7ebd9b2c0d650f15e5924798cc54611d47961f8f
* | | | | | Merge "Remove useless dhcp_domain flags in EC2"Jenkins2012-03-221-1/+0
|\ \ \ \ \ \
| * | | | | | Remove useless dhcp_domain flags in EC2Julien Danjou2012-03-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e3102db4e99f23197a085dfd298220ad3f577d1 Signed-off-by: Julien Danjou <julien@danjou.info>
* | | | | | | Merge "Handle correctly QuotaError in EC2 API"Jenkins2012-03-221-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Handle correctly QuotaError in EC2 APIJulien Danjou2012-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch, EC2 API returns UnknownError when quota is exceeded, see bug #853381 This patch fixes that by handling the exception. Now euca-run-instances returns useful information: $ euca-run-instances --instance-count 10 --instance-type m1.8gb.2cpus.diskless ami-00000012 QuotaError: Quota exceeded: code=InstanceLimitExceeded Change-Id: I1f7b381b34d2f538b7cc2d9582a40fd8bf88fbc3 Signed-off-by: Julien Danjou <julien@danjou.info>
* | | | | | | | Merge "Avoid unplugging VBDs for rescue instances"Jenkins2012-03-222-30/+22
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Avoid unplugging VBDs for rescue instancesJohannes Erdfelt2012-03-222-30/+22
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 961524 Unplugging can only happen if the instance is running and that might not be the case. So instead of unplugging the root disk VBD, just ignore it when it comes to deleting VDIs. Change-Id: Id6c01527befed7775fdd7a4d30d0d3bee1178c51
* | | | | | | Merge "Imported Translations from Launchpad"OpenStack Jenkins2012-03-2219-30988/+33258
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Imported Translations from LaunchpadOpenStack Jenkins2012-03-2219-30988/+33258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0c5a38248ca86809d8b22e4642049537da3a7b7
* | | | | | | Rollback create_disks handles StorageError exception.Rick Harris2012-03-222-26/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 961762 Change-Id: I146cecdd801a92b84adb4cc40bdf0a8c43950dd5
* | | | | | Merge "Capture SIGTERM and Shut down python services cleanly."Jenkins2012-03-221-0/+10
|\ \ \ \ \ \
| * | | | | | Capture SIGTERM and Shut down python services cleanly.Josh Kearney2012-03-221-0/+10
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step in clean shut downs. Does not yet support eventlet threads. Change-Id: Ibcd26ed61cf56947a8bdbe291d87cb211fc1ccd8
* | | | | | Merge "Strip auth token from log output."Jenkins2012-03-222-14/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Strip auth token from log output.Russell Bryant2012-03-212-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 956777. This patch updates _safe_log, which is used for rpc debug logs, to not include auth tokens. Change-Id: I36bb4233acd356f85b0e6006a6b812a67605b393
* | | | | | Clarify HACKING's shadow built-in guidance.Rick Harris2012-03-211-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf38d3ec3254e83d2289b7b17966ec44d9757b8c
* | | | | | Fail-fast for invalid read_deleted valuesRick Harris2012-03-212-3/+25
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 961588 Change-Id: Ib02d89485cdf4626698b959a2136841109cdc51f
* | | / / Only shutdown rescue instance if it's not already shutdownJohannes Erdfelt2012-03-211-1/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Fixes bug 961507 Change-Id: Ib48d6ea3ad7c89e922cde8e0c0952d1bee2ca7bf
* | | | Merge "Don't send snapshot requests through the scheduler"Jenkins2012-03-211-6/+7
|\ \ \ \
| * | | | Don't send snapshot requests through the schedulerVishvananda Ishaya2012-03-201-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If there is more than one volume host, snapshots need to be created on the host that has the volume. Sending the request through the scheduler means that the snapshot will sometimes be created on the wrong host and fail. * Fixes bug 960437 Change-Id: If8562bd533226cf9aee1d3be522f799d233581a9
* | | | | Merge "Implement quota classes."Jenkins2012-03-2115-24/+692
|\ \ \ \ \
| * | | | | Implement quota classes.Kevin L. Mitchell2012-03-2015-24/+692
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows entire classes of quotas to be associated with projects, which makes it easier to set specific quotas across multiple projects. TODO: * (?) Adding a mapping between projects and quota classes Change-Id: I6b6477481187d16af225d33c1989430e4071d5a8
* | | | | | Fix unplug_vbd to retry a configurable number of timesJohannes Erdfelt2012-03-211-37/+34
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 960655 A previous cleanup ended up changing the exception raised by unplug_vbd which caused vbd_unplug_with_retry to fail to retry. Since it's common to retry, bake that functionality straight into unplug_vbd for other users too. Change-Id: I3370c560a1997459ab37b9d5f1181464fa5b0f0c
* | | | | Merge "Fixes bug 949038"Jenkins2012-03-203-35/+39
|\ \ \ \ \
| * | | | | Fixes bug 949038John Garbutt2012-03-203-35/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the api calls better fit the standard pattern where read_deleted can be changed using context.read_deleted I have retained the ability to pass read_deleted explicitly. If that is not specified, it uses the value in the context. Note: read_deleted defaults to "no" in the context. The two exceptions are: aggregate_host_get_all aggregate_get_all In this case, it is better for read_deleted=yes to be the default So in this case the context cannot be used, as that would default to read_deleted=no. In this case you must explicity override read_deleted, the context is totally ignored, as before. Change-Id: Idb048a592d8c6b788651d131a3345e70989c0ec4
* | | | | Merge "Fixes bug 957708."Jenkins2012-03-201-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes bug 957708.MotoKen2012-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around bug in netaddr 0.7.5 https://github.com/drkjam/netaddr/issues/2 Change-Id: I3e064860c3865d5029481e6d63c5284d275a0081
* | | | | Open FolsomThierry Carrez2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch version to 2012.2 to formally open Folsom. Change-Id: If2e9e624a13444e4cb6a08f3bb76ca3027d7ef46
* | | | | Improvements/corrections to vnc docs.Anthony Young2012-03-191-35/+35
|/ / / / | | | | | | | | | | | | | | | | | | | | * Fixes bug 959929 Change-Id: Ieb8234a3b9e432ae39d33d89b24a8148a01454e3
* | | | Allow rate limiting to be disabled via flagVishvananda Ishaya2012-03-194-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | * fixes bug 947776 Change-Id: I892394ead2d1921ac8390e54312c5229929042f5