summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Call detach_volume when attach fails"Jenkins2012-02-282-1/+16
|\
| * Call detach_volume when attach failsBrian Waldon2012-02-272-1/+16
| | | | | | | | | | | | | | * Fixes bug 914974 * Raise exception.DeviceBusy when volume cannot attach Change-Id: Ie18377ba6acd6226612c70fa209185cc579c2d85
* | Use assertDictMatch to keep 2.6 unit tests passingMark Washenberger2012-02-281-1/+1
| | | | | | | | Change-Id: I5cdcbeec8bd36250e6d6dff34b2bbbd12f10d280
* | Merge "Handle case where instance['info_cache'] is None"Jenkins2012-02-282-2/+4
|\ \
| * | Handle case where instance['info_cache'] is NoneChris Behrens2012-02-282-2/+4
| | | | | | | | | | | | | | | | | | Fixes bug 942443 Change-Id: I77c3495d1de0a9b73acc576dd0638b430a4ce16e
* | | Merge "TypeError API exceptions get logged incorrectly"Jenkins2012-02-281-2/+3
|\ \ \ | |/ / |/| |
| * | TypeError API exceptions get logged incorrectlyChris Behrens2012-02-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 942431 LOG.exception() always logs sys.exc_info() which does not always represent the real exception we want to log. This changes the wsgi ResourceExceptionHandler context manager to LOG.error() the traeback info that's passed to __exit__() Change-Id: I0c3728a9ee740597feb828a513aea76e7849efc6
* | | Merge "Fixes cloudpipe extension to work with keystone"Jenkins2012-02-2810-273/+151
|\ \ \
| * | | Fixes cloudpipe extension to work with keystoneVishvananda Ishaya2012-02-2610-273/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removes deprecated auth from cloudpipe extension * Fixes pipelib to not use ec2_api * Changes vpn_image_id to be a uuid * Uses network api to retrieve information * Simplifies cloudpipe tests * Removes nova-manage cloudpipe launching * Removes related unused db methods * Fixes bug 940744 Change-Id: I5fd1fb49a9e11b89062aa754501fed29874cb6ee
* | | | Merge "Add utils.tempdir() context manager for easy temp dirs"Jenkins2012-02-2810-326/+261
|\ \ \ \ | |_|/ / |/| | |
| * | | Add utils.tempdir() context manager for easy temp dirsJohannes Erdfelt2012-02-2810-326/+261
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 883323 (and others) Users of tempfile.mkdtemp() need to make sure the directory is cleaned up when it's done being used. Unfortunately, not all of the code does so at all, or safely (by using a try/finally block). Change-Id: I270109d83efec4f8b3dd954021493f4d96c6ab79
* / | Remove monkey patching in carrot RPC driverJohannes Erdfelt2012-02-281-3/+0
|/ / | | | | | | | | | | | | It's already handled more appropriately by nova/testing/runner.py and by the individual executables in bin Change-Id: I8a0dcc699a859ce78575b0c3d2b9dc8faea0b847
* | Merge "Adds temporary chown to sparse_copy."Jenkins2012-02-272-19/+44
|\ \
| * | Adds temporary chown to sparse_copy.Rick Harris2012-02-272-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | `sparse_copy` needs read and write access to the devices. Since we cannot shell out to a run-as-root command here, we temporarily take ownership of the device. Change-Id: I891c38dbcba7177286dca729684c88ac065bd085
* | | make nova-network usable with Python < 2.6.5Christian Berendt2012-02-271-7/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | there is in issue in Python < 2.6.5 with using unicode strings as keyword arguemnts. see http://bugs.python.org/issue4978 for details. because several not-yet-outdated enterprise distributions are using Python < 2.6.5 the unicode strings in the keys of the dictionaries in used as keyword arguments nova/network/model.py should be converted. fixes bug 940941 Change-Id: Ib1d9955677e228fce6cc8e17fddc780d1a839d84
* | Merge "Re-adds ssl to kombu configuration and adds flags that are needed to ↵Jenkins2012-02-273-1/+103
|\ \ | | | | | | | | | pass through to kombu."
| * | Re-adds ssl to kombu configuration and adds flags that are needed to pass ↵Joshua Harlow2012-02-273-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through to kombu. Implements part of blueprint ssl-endpoints Adds in configuration options: kombu_ssl_version (ssl version) kombu_ssl_keyfile (ssl keyfile) kombu_ssl_certfile (ssl certfile) kombu_ssl_ca_certs (ssl ca certfile) This adds onto rabbit_use_ssl (which must be True for the above to have any effect) and allows users to specify in greater detail (more than just True/False) how SSL is going to be configured. Change-Id: I2186a6aa9397df857321324bf4007bc8310b85ce
* | | Merge "Fix bug 900864 Quantum Manager flag for IP injection."Jenkins2012-02-271-0/+1
|\ \ \ | |/ / |/| |
| * | Fix bug 900864 Quantum Manager flag for IP injection.Dave Lapsley2012-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | Re-uses FlatManager flat_injected flag to enable/disable IP injection in QuantumManager. Change-Id: I52c7a2c3aed452045cadb2282a59851c1083a812
* | | Merge "Remove unused import"Jenkins2012-02-271-1/+0
|\ \ \
| * | | Remove unused importMark McLoughlin2012-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Introduced by f96dcc39, "Make sure detail view works for volume snaphots" Change-Id: Ie076cbbf05392ca3102c0e8430c0b5da78986046
* | | | Merge "Imported Translations from Launchpad"OpenStack Jenkins2012-02-2719-34478/+26008
|\ \ \ \
| * | | | Imported Translations from LaunchpadOpenStack Jenkins2012-02-2619-34478/+26008
| | | | | | | | | | | | | | | | | | | | Change-Id: I8152b3e86a991e691d804663da403f9a2f72c4d2
* | | | | Merge "Cleanup .rescue files in libvirt driver unrescue."Jenkins2012-02-271-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cleanup .rescue files in libvirt driver unrescue.Dan Prince2012-02-261-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the libvirt driver so that it cleans up the .rescue image files in an unrescue operation. Fixes LP Bug #941591. Change-Id: Ib9f66834b8189912ec8408eeeb0d4ef35d41d39a
* | | | Make sure detail view works for volume snaphotsVishvananda Ishaya2012-02-264-4/+102
| |/ / |/| | | | | | | | | | | | | | | | | | | | * adds tests for volume router * test uncovered bug in versions that now fixed * fixes bug 940616 Change-Id: I3f780d59d2fd60ebca3d142277a747400fe35336
* | | Update EC2KeystoneAuth to grab tenant 'id'.Dan Prince2012-02-251-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | Updates the EC2KeystoneAuth middleware so that it supports formatting changes to the Keystone /ec2tokens extension. Instead of setting project_id to a tenant dict this change correctly sets it to an id. Fixes LP Bug #941119. Change-Id: I318ed594929162eafb5d7c3d8b9583cb109b73d4
* | Merge "Monkey patch migrate < 0.7.3"Jenkins2012-02-252-16/+38
|\ \
| * | Monkey patch migrate < 0.7.3Jason Kölker2012-02-242-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Works around migrate issue 72 [1] by monkey patching migrate prior to import. * Removes previous workaround * Refactor test config to work under nosetests directly * Fixes LP940407 1: https://code.google.com/p/sqlalchemy-migrate/issues/detail?id=72 Change-Id: I219e4cecf8bb2e34ae238ac270428f496378ee61
* | | Fixes bug lp#940734 - Adding manager import so AuthMiddleware worksmbasnight2012-02-242-2/+3
| | | | | | | | | | | | Change-Id: Ia4653daf02c14c41bab8e62f063e7673321073f4
* | | Merge "fix unicode triggered failure in AuthManager"Jenkins2012-02-252-1/+2
|\ \ \
| * | | fix unicode triggered failure in AuthManagerRussell Sim2012-02-242-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | * Always return a string from AuthManager._build_mc_key() * Fixes bug 938375 Change-Id: Iffceffab8ae62830202de07e3237230dab4e5a60
* | | Merge "Clean stale lockfiles on service startup : fixes bug 785955"Jenkins2012-02-254-1/+298
|\ \ \
| * | | Clean stale lockfiles on service startup : fixes bug 785955Mike Pittaro2012-02-244-1/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds cleanup_files_locks() to nova/utils, which cleans up stale locks left behind after process failures. Adds a call to clean up locks on service startup for nova-api, nova-cert, nova-compute, nova-network, nova-objectstore, and nova-scheduler. Adds tools/clean_file_locks.py, which can be used to manually clean stale locks. Change-Id: I752e0b24d3c7fc5f1dc290da355cbd7f430789b8
* | | | Merge "Improve unit test coverage per bug/934566."Jenkins2012-02-252-14/+180
|\ \ \ \ | |/ / / |/| | |
| * | | Improve unit test coverage per bug/934566.Michael Still2012-02-232-14/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit test coverage for the last untested method in imagecache.py. This brings the coverage for this module to 100%. Change-Id: I9d4c0a521842bdbb72f4ae5b54839c15ab49f38e
* | | | Merge "Don't delete security group in use from OS API."Jenkins2012-02-242-0/+22
|\ \ \ \
| * | | | Don't delete security group in use from OS API.Russell Bryant2012-02-232-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 938853. This patch adds a check to the OpenStack API so that a security group still in use can not be deleted. This same check just recently went in for the EC2 API. Change-Id: I75dc47c5f5d227b94c45ba8a0f00c37bd63f09fc
* | | | | Merge "Example config_drive init script, label the config drive"Jenkins2012-02-243-5/+77
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Example config_drive init script, label the config driveJustin Santa Barbara2012-02-243-5/+77
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configuration with DHCP & cloud-init can be painful. The config_drive is great, and it avoids disk injection, but there's no example of how to use it. So here's a little example init.d script for contrib, and a code patch to make sure the config drive gets a nice volume label. Change-Id: I22a1d6a824856ca9651b435d0fe54e348ab107fe
* | | | Merge "Copy data when migration dst is on a different FS"Jenkins2012-02-241-7/+8
|\ \ \ \
| * | | | Copy data when migration dst is on a different FSMark Washenberger2012-02-231-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 939916 Change-Id: I678e15a13f99b59b16bd446f566b2c48dcba6057
* | | | | Fix MANIFEST.in to include missing filesThierry Carrez2012-02-241-0/+6
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix MANIFEST.in to include missing files in generated tarballs. Fixes bug 940360. Change-Id: I8abba2c952c95f653a4ceb4595600d67ccdeed8d
* | | | Merge "Fix instance stop in EC2 create_image"Jenkins2012-02-241-1/+1
|\ \ \ \
| * | | | Fix instance stop in EC2 create_imageJulien Danjou2012-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iceee28165ec447d5fa294b73d121fbbf601c4332 Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
* | | | | Merge "Fix vnc docs: novaclient now supports vnc consoles."Jenkins2012-02-241-4/+0
|\ \ \ \ \
| * | | | | Fix vnc docs: novaclient now supports vnc consoles.Anthony Young2012-02-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * novaclient now supports retrieval of vnc consoles, so remove reference to outdated branch. Change-Id: Ifb8d7e6d2e15d3674fd32f074d1a92e5035ed941
* | | | | | Merge "libvirt vif-plugging fixes. Fixes bug 939252 , bug 939254"Jenkins2012-02-243-1/+188
|\ \ \ \ \ \
| * | | | | | libvirt vif-plugging fixes. Fixes bug 939252 , bug 939254Dan Wendlandt2012-02-223-1/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix OVS vif-plugging on red hat / fedora by supporting recent libvirt change that provides OVS + libvirt integration. - Create unit tests that provide coverage for all libvirt vif drivers - Correctly set vm-uuid flag in existing OVS vif-plugging mechanism. Change-Id: I29eeeda92d44a1c026d1c17cf169a1bf2b5a0cc1
* | | | | | | Merge "Fixes error if Melange returns no networks"Jenkins2012-02-241-1/+1
|\ \ \ \ \ \ \